martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Paul Eggert
2015-10-28 09:10:17 -07:00
parent 020e850557
commit 45cdacb098
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dispnew.c
View File

@@ -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);