Merge branch '4650_shift_f4_segfault'

aborodin · aborodin · commit f2b482886711 · 2025-02-09T16:05:11.000+03:00
* 4650_shift_f4_segfault: Ticket #4650: fix a segfault when parsing extern_cmd_options fails.
diff --git a/src/execute.c b/src/execute.c
@@ -308,13 +308,14 @@ do_executev (const char *shell, int flags, char *const argv[])
     if (mc_global.tty.console_flag != '\0')
         handle_console (CONSOLE_RESTORE);
 
-    if (!mc_global.tty.use_subshell && *argv != NULL && (flags & EXECUTE_INTERNAL) == 0)
+    if (!mc_global.tty.use_subshell && (flags & EXECUTE_INTERNAL) == 0 && argv != NULL
+        && *argv != NULL)
     {
         printf ("%s%s\n", mc_prompt, *argv);
         fflush (stdout);
     }
 #ifdef ENABLE_SUBSHELL
-    if (mc_global.tty.use_subshell && (flags & EXECUTE_INTERNAL) == 0)
+    if (mc_global.tty.use_subshell && (flags & EXECUTE_INTERNAL) == 0 && argv != NULL)
     {
         do_update_prompt ();
 

Original file line number	Diff line number	Diff line change
`@@ -308,13 +308,14 @@ do_executev (const char shell, int flags, char const argv[])`
`308`	`308`	`if (mc_global.tty.console_flag != '\0')`
`309`	`309`	`handle_console (CONSOLE_RESTORE);`
`310`	`310`
`311`		`- if (!mc_global.tty.use_subshell && *argv != NULL && (flags & EXECUTE_INTERNAL) == 0)`
	`311`	`+ if (!mc_global.tty.use_subshell && (flags & EXECUTE_INTERNAL) == 0 && argv != NULL`
	`312`	`+ && *argv != NULL)`
`312`	`313`	`{`
`313`	`314`	`printf ("%s%s\n", mc_prompt, *argv);`
`314`	`315`	`fflush (stdout);`
`315`	`316`	`}`
`316`	`317`	`#ifdef ENABLE_SUBSHELL`
`317`		`- if (mc_global.tty.use_subshell && (flags & EXECUTE_INTERNAL) == 0)`
	`318`	`+ if (mc_global.tty.use_subshell && (flags & EXECUTE_INTERNAL) == 0 && argv != NULL)`
`318`	`319`	`{`
`319`	`320`	`do_update_prompt ();`
`320`	`321`