Merge: user-interface timestamps and other int overflow patches.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/menu.c b/src/menu.c
index 7a3edcb6f4f..d2486439fd0 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -176,6 +176,8 @@ save_menu_items (void)
 static void
 grow_menu_items (void)
 {
+  if ((INT_MAX - MENU_ITEMS_PANE_LENGTH) / 2 < menu_items_allocated)
+    memory_full ();
   menu_items_allocated *= 2;
   menu_items = larger_vector (menu_items, menu_items_allocated, Qnil);
 }
@@ -1145,13 +1147,13 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 #else /* not HAVE_X_WINDOWS */
         Lisp_Object bar_window;
         enum scroll_bar_part part;
-        unsigned long time;
+        Time time;
         void (*mouse_position_hook) (struct frame **, int,
                                      Lisp_Object *,
                                      enum scroll_bar_part *,
                                      Lisp_Object *,
                                      Lisp_Object *,
-                                     unsigned long *) =
+                                     Time *) =
           FRAME_TERMINAL (new_f)->mouse_position_hook;
 
         if (mouse_position_hook)