mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch

https://www.midnight-commander.org/ticket/2858
https://www.midnight-commander.org/changeset/e2f30017a04b5dc557f9d8dd2e281526eba3c97f

Index: src/filemanager/usermenu.c
===================================================================
--- src/filemanager/usermenu.c  (revision 409e8ab5fd4c42fd122d42d3d13a455eb6aba96f)
+++ src/filemanager/usermenu.c  (revision e2f30017a04b5dc557f9d8dd2e281526eba3c97f)
@@ -749,6 +749,7 @@
         return g_strdup ("%");
 
-    if (mc_global.mc_run_mode == MC_RUN_FULL)
-    {
+    switch (mc_global.mc_run_mode)
+    {
+    case MC_RUN_FULL:
         if (g_ascii_islower ((gchar) c))
             panel = current_panel;
@@ -760,9 +761,16 @@
         }
         fname = g_strdup (panel->dir.list[panel->selected].fname);
-    }
+        break;
+
 #ifdef USE_INTERNAL_EDIT
-    else if (mc_global.mc_run_mode == MC_RUN_EDITOR)
+    case MC_RUN_EDITOR:
         fname = edit_get_file_name (edit_widget);
+        break;
 #endif
+
+    default:
+        /* other modes don't use formats */
+        return g_strdup ("");
+    }
 
     if (do_quote)
1	https://www.midnight-commander.org/ticket/2858
2	https://www.midnight-commander.org/changeset/e2f30017a04b5dc557f9d8dd2e281526eba3c97f
3
4	Index: src/filemanager/usermenu.c
5	===================================================================
6	--- src/filemanager/usermenu.c (revision 409e8ab5fd4c42fd122d42d3d13a455eb6aba96f)
7	+++ src/filemanager/usermenu.c (revision e2f30017a04b5dc557f9d8dd2e281526eba3c97f)
8	@@ -749,6 +749,7 @@
9	return g_strdup ("%");
10
11	- if (mc_global.mc_run_mode == MC_RUN_FULL)
12	- {
13	+ switch (mc_global.mc_run_mode)
14	+ {
15	+ case MC_RUN_FULL:
16	if (g_ascii_islower ((gchar) c))
17	panel = current_panel;
18	@@ -760,9 +761,16 @@
19	}
20	fname = g_strdup (panel->dir.list[panel->selected].fname);
21	- }
22	+ break;
23	+
24	#ifdef USE_INTERNAL_EDIT
25	- else if (mc_global.mc_run_mode == MC_RUN_EDITOR)
26	+ case MC_RUN_EDITOR:
27	fname = edit_get_file_name (edit_widget);
28	+ break;
29	#endif
30	+
31	+ default:
32	+ /* other modes don't use formats */
33	+ return g_strdup ("");
34	+ }
35
36	if (do_quote)