From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 28 Oct 2015 16:10:17 +0000 (-0700)
Subject: * src/dispnew.c (init_display): Simplify overflow checking.
X-Git-Tag: emacs-25.0.90~995
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=45cdacb09890121bdcf07279b2fe5bc6a52fa22c;p=emacs.git

* src/dispnew.c (init_display): Simplify overflow checking.
---

diff --git a/src/dispnew.c b/src/dispnew.c
index 18eed3cfb14..91640769838 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6097,8 +6097,8 @@ init_display (void)
        change.  It's not clear what better we could do.  The rest of
        the code assumes that (width + 2) * height * sizeof (struct glyph)
        does not overflow and does not exceed PTRDIFF_MAX or SIZE_MAX.  */
-    if (INT_ADD_RANGE_OVERFLOW (width, 2, INT_MIN, INT_MAX)
-	|| INT_MULTIPLY_RANGE_OVERFLOW (width + 2, height, INT_MIN, INT_MAX)
+    if (INT_ADD_OVERFLOW (width, 2)
+	|| INT_MULTIPLY_OVERFLOW (width + 2, height)
 	|| (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (struct glyph)
 	    < (width + 2) * height))
       fatal ("screen size %dx%d too big", width, height);