Merge OpenSSL 0.9.7-stable-20020605,

correctly autogenerate obj_mac.h

1 files changed, 1 insertions, 1 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c
index f3bba38269..f9414456de 100644
--- a/src/lib/libcrypto/x509v3/v3_ia5.c
+++ b/src/lib/libcrypto/x509v3/v3_ia5.c
@@ -82,7 +82,7 @@ static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
 {
         char *tmp;
         if(!ia5 || !ia5->length) return NULL;
-        tmp = OPENSSL_malloc(ia5->length + 1);
+        if (!(tmp = OPENSSL_malloc(ia5->length + 1))) return NULL;
         memcpy(tmp, ia5->data, ia5->length);
         tmp[ia5->length] = 0;
         return tmp;