From 96786ad12308215621142f7cb2ef21a9aca30665 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Sat, 6 Jun 2020 12:55:59 +0200 Subject: [PATCH] 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 Reviewed-by: Paul Dale Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/12070) --- apps/openssl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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(); -- 2.25.1