summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-11-30 16:09:04 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-11-30 16:09:04 +0000
commite9afa08cd14c37ba1b52c07501c67b958739cf22 (patch)
tree700379c3d5687f98894dc57439cd81b6a5e696b1 /crypto
parentbcaa36fd111dddd6567c628ccaae54af188ae3d3 (diff)
Update from stable branch.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/x509v3/v3_alt.c3
1 files changed, 2 insertions, 1 deletions
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;
}