From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Date: Sat, 6 Jun 2020 10:55:59 +0000 (+0200)
Subject: APPS: Fix invoking openssl without a command
X-Git-Tag: openssl-3.0.0-alpha4~42
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=96786ad12308215621142f7cb2ef21a9aca30665;p=oweals%2Fopenssl.git

APPS: Fix invoking openssl without a command

Invoking help with "empty" argc leads to a segfault.
Invoke do_cmd() with help as argument which invokes help_main() with
proper argv.

Fixes #12069

Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12070)
---

diff --git a/apps/openssl.c b/apps/openssl.c
index 4c97936824..fdf4a746f8 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -205,6 +205,8 @@ static void setup_trace(const char *str)
 }
 #endif /* OPENSSL_NO_TRACE */
 
+static char *help_argv[] = { "help" };
+
 int main(int argc, char *argv[])
 {
     FUNCTION f, *fp;
@@ -268,7 +270,7 @@ int main(int argc, char *argv[])
     /* If there's a command, run with that, otherwise "help". */
     ret = argc > 0
         ? do_cmd(prog, argc, argv)
-        : help_main(argc, argv);
+        : do_cmd(prog, 1, help_argv);
 
  end:
     app_providers_cleanup();