Improve integer range checking

* src/bignum.c (check_integer_range, check_uinteger_max)
(check_int_nonnegative): New functions.
* src/frame.c (check_frame_pixels): New function.
(Fset_frame_height, Fset_frame_width, Fset_frame_size): Use it.
* src/lisp.h (CHECK_RANGED_INTEGER, CHECK_TYPE_RANGED_INTEGER):
Remove these macros.  Unless otherwise specified, all callers
replaced by calls to check_integer_range, check_uinteger_range,
check_int_nonnegative.
* src/frame.c (gui_set_right_divider_width)
(gui_set_bottom_divider_width):
* src/nsfns.m (ns_set_internal_border_width):
* src/xfns.c (x_set_internal_border_width):
Using check_int_nonnegative means these functions no longer
incorrectly reject negative bignums; they treat them as 0,
just like negative fixnums.

1 files changed, 10 insertions, 12 deletions

diff --git a/src/menu.c b/src/menu.c
index 28bfcae05d6..6b8b5dd1210 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1253,18 +1253,16 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu)
          but I don't want to make one now.  */
       CHECK_WINDOW (window);
 
-    CHECK_RANGED_INTEGER (x,
-                          (xpos < INT_MIN - MOST_NEGATIVE_FIXNUM
-                           ? (EMACS_INT) INT_MIN - xpos
-                           : MOST_NEGATIVE_FIXNUM),
-                          INT_MAX - xpos);
-    CHECK_RANGED_INTEGER (y,
-                          (ypos < INT_MIN - MOST_NEGATIVE_FIXNUM
-                           ? (EMACS_INT) INT_MIN - ypos
-                           : MOST_NEGATIVE_FIXNUM),
-                          INT_MAX - ypos);
-    xpos += XFIXNUM (x);
-    ypos += XFIXNUM (y);
+    xpos += check_integer_range (x,
+                                 (xpos < INT_MIN - MOST_NEGATIVE_FIXNUM
+                                  ? (EMACS_INT) INT_MIN - xpos
+                                  : MOST_NEGATIVE_FIXNUM),
+                                 INT_MAX - xpos);
+    ypos += check_integer_range (y,
+                                 (ypos < INT_MIN - MOST_NEGATIVE_FIXNUM
+                                  ? (EMACS_INT) INT_MIN - ypos
+                                  : MOST_NEGATIVE_FIXNUM),
+                                 INT_MAX - ypos);
 
     XSETFRAME (Vmenu_updating_frame, f);
   }