From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 30 Nov 2008 16:09:04 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~141
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=e9afa08cd14c37ba1b52c07501c67b958739cf22

Update from stable branch.
---

diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index e9e7c4a65b..19b3a8b628 100644
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509v3/v3_alt.c
@@ -513,7 +513,8 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
 	return gen;
 
 	err:
-	GENERAL_NAME_free(gen);
+	if (!out)
+		GENERAL_NAME_free(gen);
 	return NULL;
 	}