Update from stable branch.

diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index e9e7c4a65b6140e57bd7dd7e4ee46321764e0d18..19b3a8b628e68849f7e30cc1702501cc6e31d780 100644 (file)
--- 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:
        return gen;
 
        err:

-       GENERAL_NAME_free(gen);
+       if (!out)
+               GENERAL_NAME_free(gen);

        return NULL;
        }
 
        return NULL;
        }