From: Richard Levitte <levitte@openssl.org>
Date: Thu, 6 Oct 2016 07:31:34 +0000 (+0200)
Subject: Make 'openssl prime ""' not segfault
X-Git-Tag: OpenSSL_1_0_2k~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c6aab6a527b057133b470fa8c778e3d45f1605a;p=openssl

Make 'openssl prime ""' not segfault

Fixes RT#4699

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1668)
---

diff --git a/apps/prime.c b/apps/prime.c
index 1fb1c8d845..133167f2d4 100644
--- a/apps/prime.c
+++ b/apps/prime.c
@@ -128,16 +128,24 @@ int MAIN(int argc, char **argv)
         BIO_printf(bio_out, "%s\n", s);
         OPENSSL_free(s);
     } else {
+        int r;
+
         if (hex)
-            BN_hex2bn(&bn, argv[0]);
+            r = BN_hex2bn(&bn, argv[0]);
         else
-            BN_dec2bn(&bn, argv[0]);
+            r = BN_dec2bn(&bn, argv[0]);
+
+        if(!r) {
+            BIO_printf(bio_err, "Failed to process value (%s)\n", argv[0]);
+            goto end;
+        }
 
         BN_print(bio_out, bn);
         BIO_printf(bio_out, " is %sprime\n",
                    BN_is_prime_ex(bn, checks, NULL, NULL) ? "" : "not ");
     }
 
+ end:
     BN_free(bn);
     BIO_free_all(bio_out);