merge with openssl-0.9.7-stable-SNAP-20020911,

new minor for libcrypto (_X509_REQ_print_ex)
tested by miod@, pb@

1 files changed, 5 insertions, 2 deletions

diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 18b751a91a..a8db6ffbf5 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/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);
         }