From: beck <beck@openbsd.org>
Date: Wed, 23 Apr 2014 04:33:10 +0000 (+0000)
Subject: Make sure ret->name is NULL'ed before return when freeing.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9c336a09a338b4153156a3a4d9eae218b4276499;p=openbsd

Make sure ret->name is NULL'ed before return when freeing.
from Dirk Engling <erdgeist@erdgeist.org>
---

diff --git a/lib/libcrypto/asn1/x_x509.c b/lib/libcrypto/asn1/x_x509.c
index e7d613e20f5..e93d97d2c41 100644
--- a/lib/libcrypto/asn1/x_x509.c
+++ b/lib/libcrypto/asn1/x_x509.c
@@ -125,6 +125,7 @@ x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 #endif
 		if (ret->name != NULL)
 			free(ret->name);
+		ret->name = NULL;
 		break;
 	}
 
diff --git a/lib/libssl/src/crypto/asn1/x_x509.c b/lib/libssl/src/crypto/asn1/x_x509.c
index e7d613e20f5..e93d97d2c41 100644
--- a/lib/libssl/src/crypto/asn1/x_x509.c
+++ b/lib/libssl/src/crypto/asn1/x_x509.c
@@ -125,6 +125,7 @@ x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 #endif
 		if (ret->name != NULL)
 			free(ret->name);
+		ret->name = NULL;
 		break;
 	}