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 e7d613e..e93d97d 100644 (file)
--- 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 e7d613e..e93d97d 100644 (file)
--- 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;
        }