* w32menu.c (set_frame_menubar): Fix submenu allocation.

diff --git a/src/ChangeLog b/src/ChangeLog
index 10ca2e250dcc9a3778044c0ce36b282ffa8de89f..6f70908caae73419a624ecb2089b47ed54d44e99 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * w32menu.c (set_frame_menubar): Fix submenu allocation.
+
 2011-05-07  Eli Zaretskii  <eliz@gnu.org>
 
        * w32console.c (Fset_screen_color): Doc fix.

diff --git a/src/w32menu.c b/src/w32menu.c
index c8c6a319b4008ae43c1b2ff0ffc096712b442412..ca763b553cf2e38568d3cb0c85770d006a38ab15 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -427,11 +427,10 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
 
       menu_items = f->menu_bar_vector;
       menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;
-      submenu_start = (int *) alloca (ASIZE (items) * sizeof (int *));
-      submenu_end = (int *) alloca (ASIZE (items) * sizeof (int *));
+      submenu_start = (int *) alloca (ASIZE (items) * sizeof (int));
+      submenu_end = (int *) alloca (ASIZE (items) * sizeof (int));
       submenu_n_panes = (int *) alloca (ASIZE (items) * sizeof (int));
-      submenu_top_level_items
-       = (int *) alloca (ASIZE (items) * sizeof (int *));
+      submenu_top_level_items = (int *) alloca (ASIZE (items) * sizeof (int));
       init_menu_items ();
       for (i = 0; i < ASIZE (items); i += 4)
        {