From: Bodo Möller <bodo@openssl.org>
Date: Thu, 29 Aug 2002 11:33:43 +0000 (+0000)
Subject: don't memset(data,0,...) if data is NULL
X-Git-Tag: OpenSSL_0_9_6h~103
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=145a2794dabd58fa5d01b87d5d0aef5b50f9bea1;p=oweals%2Fopenssl.git

don't memset(data,0,...) if data is NULL

Submitted by: anonymous
PR: 254
---

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 01759f75c3..043b578e22 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -405,8 +405,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);
 	}