Do not clean all GUI objects when crashing after SIGSEGV (this can cause crash inside crash!)

3 files changed, 71 insertions, 61 deletions

diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c
index 3578775e8..a0347361b 100644
--- a/src/gui/curses/gui-curses-main.c
+++ b/src/gui/curses/gui-curses-main.c
@@ -313,41 +313,46 @@ gui_main_loop ()
 
 /*
  * gui_main_end: GUI end
+ *               clean_exit is 0 when WeeChat is crashing (we don't clean
+ *               objects because WeeChat can crash again during this cleanup...)
  */
 
 void
-gui_main_end ()
+gui_main_end (int clean_exit)
 {
-    /* remove bar items and bars */
-    gui_bar_item_end ();
-    gui_bar_free_all ();
-    
-    /* free clipboard buffer */
-    if (gui_input_clipboard)
-        free (gui_input_clipboard);
-    
-    /* delete all windows */
-    while (gui_windows)
-        gui_window_free (gui_windows);
-    gui_window_tree_free (&gui_windows_tree);
-
-    /* delete all buffers */
-    while (gui_buffers)
-        gui_buffer_close (gui_buffers, 0);
-    
-    /* delete global history */
-    gui_history_global_free ();
-    
-    /* delete infobar messages */
-    while (gui_infobar)
-        gui_infobar_remove ();
-
-    /* reset title */
-    if (CONFIG_BOOLEAN(config_look_set_title))
-	gui_window_title_reset ();
-    
-    /* end color */
-    gui_color_end ();
+    if (clean_exit)
+    {
+        /* remove bar items and bars */
+        gui_bar_item_end ();
+        gui_bar_free_all ();
+        
+        /* free clipboard buffer */
+        if (gui_input_clipboard)
+            free (gui_input_clipboard);
+        
+        /* delete all windows */
+        while (gui_windows)
+            gui_window_free (gui_windows);
+        gui_window_tree_free (&gui_windows_tree);
+        
+        /* delete all buffers */
+        while (gui_buffers)
+            gui_buffer_close (gui_buffers, 0);
+        
+        /* delete global history */
+        gui_history_global_free ();
+        
+        /* delete infobar messages */
+        while (gui_infobar)
+            gui_infobar_remove ();
+        
+        /* reset title */
+        if (CONFIG_BOOLEAN(config_look_set_title))
+            gui_window_title_reset ();
+        
+        /* end color */
+        gui_color_end ();
+    }
     
     /* end of Curses output */
     refresh ();
diff --git a/src/gui/gtk/gui-gtk-main.c b/src/gui/gtk/gui-gtk-main.c
index d2f216e02..4cdb3ff37 100644
--- a/src/gui/gtk/gui-gtk-main.c
+++ b/src/gui/gtk/gui-gtk-main.c
@@ -205,40 +205,45 @@ gui_main_loop ()
 
 /*
  * gui_main_end: GUI end
+ *               clean_exit is 0 when WeeChat is crashing (we don't clean
+ *               objects because WeeChat can crash again during this cleanup...)
  */
 
 void
-gui_main_end ()
+gui_main_end (int clean_exit)
 {
     struct t_gui_window *ptr_win;
-    
-    /* free clipboard buffer */
-    if (gui_input_clipboard)
-      free(gui_input_clipboard);
-    
-    /* delete all windows */
-    for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
+
+    if (clean_exit)
     {
-        /* TODO: destroy Gtk widgets */
+        /* free clipboard buffer */
+        if (gui_input_clipboard)
+            free(gui_input_clipboard);
+        
+        /* delete all windows */
+        for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
+        {
+            /* TODO: destroy Gtk widgets */
+        }
+        
+        /* delete all buffers */
+        while (gui_buffers)
+            gui_buffer_close (gui_buffers, 0);
+        
+        /* delete all windows */
+        while (gui_windows)
+            gui_window_free (gui_windows);
+        gui_window_tree_free (&gui_windows_tree);
+        
+        /* delete global history */
+        gui_history_global_free ();
+        
+        /* delete infobar messages */
+        while (gui_infobar)
+            gui_infobar_remove ();
+        
+        /* reset title */
+        if (CONFIG_BOOLEAN(config_look_set_title))
+            gui_window_title_reset ();
     }
-    
-    /* delete all buffers */
-    while (gui_buffers)
-        gui_buffer_close (gui_buffers, 0);
-    
-    /* delete all windows */
-    while (gui_windows)
-        gui_window_free (gui_windows);
-    gui_window_tree_free (&gui_windows_tree);
-    
-    /* delete global history */
-    gui_history_global_free ();
-    
-    /* delete infobar messages */
-    while (gui_infobar)
-        gui_infobar_remove ();
-
-    /* reset title */
-    if (CONFIG_BOOLEAN(config_look_set_title))
-	gui_window_title_reset ();
 }
diff --git a/src/gui/gui-main.h b/src/gui/gui-main.h
index ca694617d..267e37c4b 100644
--- a/src/gui/gui-main.h
+++ b/src/gui/gui-main.h
@@ -25,6 +25,6 @@
 extern void gui_main_loop ();
 extern void gui_main_pre_init (int *argc, char **argv[]);
 extern void gui_main_init ();
-extern void gui_main_end ();
+extern void gui_main_end (int clean_exit);
 
 #endif /* gui-main.h */