[openssl] OpenSSL_1_1_1-stable update

[Dr. Paul Dale]

The branch OpenSSL_1_1_1-stable has been updated
       via  b4378fd6a250cd4c57d78e6df48ef5c0ca08ed86 (commit)
      from  328fd8833395b95bf0b07490b008c1dc927ce362 (commit)


- Log -----------------------------------------------------------------
commit b4378fd6a250cd4c57d78e6df48ef5c0ca08ed86
Author: Pauli <paul.dale at oracle.com>
Date:   Thu Nov 21 13:50:03 2019 +1000

    main: avoid a NULL dereference on initialisation.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10495)
    
    (cherry picked from commit acc7b9fb5c162c2ca522e5e1e09d1efbde8dc6a0)

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

Summary of changes:
 apps/openssl.c | 7 +++++++
 1 file changed, 7 insertions(+)

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 */