[Emacs-diffs] /srv/bzr/emacs/trunk r104169: * w32menu.c (set_frame_menubar): Fix submenu allocation.

[Andreas Schwab]

------------------------------------------------------------
revno: 104169
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Mon 2011-05-09 13:29:51 +0200
message:
  * w32menu.c (set_frame_menubar): Fix submenu allocation.
modified:
  src/ChangeLog
  src/w32menu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-07 15:44:19 +0000
+++ b/src/ChangeLog     2011-05-09 11:29:51 +0000
@@ -1,3 +1,7 @@
+2011-05-09  Andreas Schwab  <address@hidden>
+
+       * w32menu.c (set_frame_menubar): Fix submenu allocation.
+
 2011-05-07  Eli Zaretskii  <address@hidden>
 
        * w32console.c (Fset_screen_color): Doc fix.

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2011-04-25 21:34:39 +0000
+++ b/src/w32menu.c     2011-05-09 11:29:51 +0000
@@ -427,11 +427,10 @@
 
       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)
        {