[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100628: Fix memory leak by y-or-n-p-with-timeout with GUI (Bug#9830).

[YAMAMOTO Mitsuharu]

------------------------------------------------------------
revno: 100628
committer: YAMAMOTO Mitsuharu <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-10-31 12:08:54 +0900
message:
  Fix memory leak by y-or-n-p-with-timeout with GUI (Bug#9830).
  
  * xmenu.c (cleanup_widget_value_tree): New function.
  (xmenu_show, xdialog_show): Use it in record_unwind_protect instead of
  calling free_menubar_widget_value_tree directly (Bug#9830).
modified:
  src/ChangeLog
  src/xmenu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-19 21:15:47 +0000
+++ b/src/ChangeLog     2011-10-31 03:08:54 +0000
@@ -1,3 +1,9 @@
+2011-10-31  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * xmenu.c (cleanup_widget_value_tree): New function.
+       (xmenu_show, xdialog_show): Use it in record_unwind_protect instead of
+       calling free_menubar_widget_value_tree directly (Bug#9830).
+
 2011-09-19  Andreas Schwab  <address@hidden>
 
        * keymap.c (Fsingle_key_description): Use make_specified_string

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2011-05-09 11:13:02 +0000
+++ b/src/xmenu.c       2011-10-31 03:08:54 +0000
@@ -1658,6 +1658,17 @@
 
 #endif /* not USE_GTK */
 
+static Lisp_Object
+cleanup_widget_value_tree (Lisp_Object arg)
+{
+  struct Lisp_Save_Value *p = XSAVE_VALUE (arg);
+  widget_value *wv = p->pointer;
+
+  free_menubar_widget_value_tree (wv);
+
+  return Qnil;
+}
+
 Lisp_Object
 xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
            Lisp_Object title, char **error, EMACS_UINT timestamp)
@@ -1672,6 +1683,8 @@
 
   int first_pane;
 
+  int specpdl_count = SPECPDL_INDEX ();
+
   if (! FRAME_X_P (f))
     abort ();
 
@@ -1866,11 +1879,15 @@
   /* No selection has been chosen yet.  */
   menu_item_selection = 0;
 
+  /* Make sure to free the widget_value objects we used to specify the
+     contents even with longjmp.  */
+  record_unwind_protect (cleanup_widget_value_tree,
+                        make_save_value (first_wv, 0));
+
   /* Actually create and show the menu until popped down.  */
   create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp);
 
-  /* Free the widget_value objects we used to specify the contents.  */
-  free_menubar_widget_value_tree (first_wv);
+  unbind_to (specpdl_count, Qnil);
 
   /* Find the selected item, and its pane, to return
      the proper value.  */
@@ -2064,6 +2081,8 @@
   /* 1 means we've seen the boundary between left-hand elts and right-hand.  */
   int boundary_seen = 0;
 
+  int specpdl_count = SPECPDL_INDEX ();
+
   if (! FRAME_X_P (f))
     abort ();
 
@@ -2177,11 +2196,15 @@
   /* No selection has been chosen yet.  */
   menu_item_selection = 0;
 
+  /* Make sure to free the widget_value objects we used to specify the
+     contents even with longjmp.  */
+  record_unwind_protect (cleanup_widget_value_tree,
+                        make_save_value (first_wv, 0));
+
   /* Actually create and show the dialog.  */
   create_and_show_dialog (f, first_wv);
 
-  /* Free the widget_value objects we used to specify the contents.  */
-  free_menubar_widget_value_tree (first_wv);
+  unbind_to (specpdl_count, Qnil);
 
   /* Find the selected item, and its pane, to return
      the proper value.  */