aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-05 13:26:55 -0700
committerPaul Eggert2011-04-05 13:26:55 -0700
commitf390e2d53a670e4ebcb6b73f4baeaf792f46c112 (patch)
treefc9abeff47b869176ae493059089f4f90eb409aa
parent42eea0d01a839d6bd024a13577d16108696e11e4 (diff)
downloademacs-f390e2d53a670e4ebcb6b73f4baeaf792f46c112.tar.gz
emacs-f390e2d53a670e4ebcb6b73f4baeaf792f46c112.zip
* xmenu.c (Fx_popup_dialog): Don't assume string is free of formats.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xmenu.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 99cdde19234..282b41afd3c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
2 2
3 Fix more problems found by GCC 4.6.0's static checks. 3 Fix more problems found by GCC 4.6.0's static checks.
4 4
5 * xmenu.c (Fx_popup_dialog): Don't assume string is free of formats.
6
5 * menu.c (Fx_popup_menu): Don't assume error_name lacks printf formats. 7 * menu.c (Fx_popup_menu): Don't assume error_name lacks printf formats.
6 8
7 * fns.c (Fstring_to_unibyte): Don't rely on undefined behavior 9 * fns.c (Fstring_to_unibyte): Don't rely on undefined behavior
diff --git a/src/xmenu.c b/src/xmenu.c
index 8ecef00c88e..6e175e69039 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -341,7 +341,7 @@ for instance using the window manager, then this produces a quit and
341 unbind_to (specpdl_count, Qnil); 341 unbind_to (specpdl_count, Qnil);
342 discard_menu_items (); 342 discard_menu_items ();
343 343
344 if (error_name) error (error_name); 344 if (error_name) error ("%s", error_name);
345 return selection; 345 return selection;
346 } 346 }
347#endif 347#endif