[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Matt Caswell]

The branch OpenSSL_1_0_1-stable has been updated
       via  f5ee5213073870493a8ade98b13ea41a2b20b8d4 (commit)
      from  58d8a271ab1eb38fc2983519fb3c37a900df41cf (commit)


- Log -----------------------------------------------------------------
commit f5ee5213073870493a8ade98b13ea41a2b20b8d4
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 10 23:15:15 2015 +0000

    Fix seg fault in ASN1_generate_v3/ASN1_generate_nconf
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
    (cherry picked from commit ac5a110621ca48f0bebd5b4d76d081de403da29e)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/asn1_gen.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index b71ae48..11b582d 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -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))