diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-09-14 11:18:05 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-09-14 11:18:05 +0000 |
| commit | f4428d8101c504f427625270a1dfb1d4be89987f (patch) | |
| tree | ee462389672345f98c9a6edd8bbded5bb36bd3d0 /lib/libcrypto/pem | |
| parent | 7d5614b00acb8f7a6a52cac536b12db6326859c3 (diff) | |
merge with openssl-0.9.7-stable-SNAP-20020911,
new minor for libcrypto (_X509_REQ_print_ex)
tested by miod@, pb@
Diffstat (limited to 'lib/libcrypto/pem')
| -rw-r--r-- | lib/libcrypto/pem/pem_lib.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/libcrypto/pem/pem_lib.c b/lib/libcrypto/pem/pem_lib.c index 18b751a91a8..a8db6ffbf5c 100644 --- a/lib/libcrypto/pem/pem_lib.c +++ b/lib/libcrypto/pem/pem_lib.c @@ -366,8 +366,11 @@ err: memset(iv,0,sizeof(iv)); memset((char *)&ctx,0,sizeof(ctx)); memset(buf,0,PEM_BUFSIZE); - memset(data,0,(unsigned int)dsize); - OPENSSL_free(data); + if (data != NULL) + { + memset(data,0,(unsigned int)dsize); + OPENSSL_free(data); + } return(ret); } |