Fix seg fault in ASN1_generate_v3/ASN1_generate_nconf
authorMatt Caswell <matt@openssl.org>
Tue, 10 Mar 2015 23:15:15 +0000 (23:15 +0000)
committerMatt Caswell <matt@openssl.org>
Wed, 11 Mar 2015 11:32:07 +0000 (11:32 +0000)
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit ac5a110621ca48f0bebd5b4d76d081de403da29e)

crypto/asn1/asn1_gen.c

index b71ae48..11b582d 100644 (file)
@@ -353,6 +353,10 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
         break;
 
     case ASN1_GEN_FLAG_FORMAT:
+        if(!vstart) {
+            ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
+            return -1;
+        }
         if (!strncmp(vstart, "ASCII", 5))
             arg->format = ASN1_GEN_FORMAT_ASCII;
         else if (!strncmp(vstart, "UTF8", 4))