]> granicus.if.org Git - openssl/commitdiff
Fix infinite loop. PR#3347
authorViktor Dukhovni <openssl-users@dukhovni.org>
Sun, 11 May 2014 19:28:56 +0000 (20:28 +0100)
committerMatt Caswell <matt@openssl.org>
Sun, 11 May 2014 19:28:56 +0000 (20:28 +0100)
apps/req.c

index 316163ff786af3790d774574c771350519948a27..6a19144931c68464549da95ea85b155fe334a924 100644 (file)
@@ -1486,7 +1486,13 @@ start:
 #ifdef CHARSET_EBCDIC
        ebcdic2ascii(buf, buf, i);
 #endif
-       if(!req_check_len(i, n_min, n_max)) goto start;
+       if(!req_check_len(i, n_min, n_max))
+               {
+               if (batch || value)
+                       return 0;
+               goto start;
+               }
+
        if (!X509_NAME_add_entry_by_NID(n,nid, chtype,
                                (unsigned char *) buf, -1,-1,mval)) goto err;
        ret=1;
@@ -1545,7 +1551,12 @@ start:
 #ifdef CHARSET_EBCDIC
        ebcdic2ascii(buf, buf, i);
 #endif
-       if(!req_check_len(i, n_min, n_max)) goto start;
+       if(!req_check_len(i, n_min, n_max))
+               {
+               if (batch || value)
+                       return 0;
+               goto start;
+               }
 
        if(!X509_REQ_add1_attr_by_NID(req, nid, chtype,
                                        (unsigned char *)buf, -1)) {