From: Pauli <paul.dale@oracle.com>
Date: Thu, 21 Nov 2019 03:50:03 +0000 (+1000)
Subject: main: avoid a NULL dereference on initialisation.
X-Git-Tag: OpenSSL_1_1_1e~132
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b4378fd6a250cd4c57d78e6df48ef5c0ca08ed86;p=oweals%2Fopenssl.git

main: avoid a NULL dereference on initialisation.

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

(cherry picked from commit acc7b9fb5c162c2ca522e5e1e09d1efbde8dc6a0)
---

diff --git a/apps/openssl.c b/apps/openssl.c
index 9648f35b02..ff7b759a40 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -164,6 +164,13 @@ int main(int argc, char *argv[])
     }
 
     prog = prog_init();
+    if (prog == NULL) {
+        BIO_printf(bio_err,
+                   "FATAL: Startup failure (dev note: prog_init() failed)\n");
+        ERR_print_errors(bio_err);
+        ret = 1;
+        goto end;
+    }
     pname = opt_progname(argv[0]);
 
     /* first check the program name */