circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

UINT_MAX.

pull/1/head
Nicholas Marriott 2008-09-29 16:58:02 +00:00
parent 8132b4d092
commit 9d6827ebb2
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
array.h
View File

@ -1,4 +1,4 @@
/* $Id: array.h,v 1.6 2008-08-07 20:20:52 nicm Exp $ */
/* $Id: array.h,v 1.7 2008-09-29 16:58:02 nicm Exp $ */
/*
* Copyright (c) 2006 Nicholas Marriott <nicm@users.sourceforge.net>
@ -31,7 +31,7 @@
#define ARRAY_INITIALSPACE(a) (10 * ARRAY_ITEMSIZE(a))
#define ARRAY_ENSURE(a, n) do { \
if (SIZE_MAX - (n) < (a)->num) \
if (UINT_MAX - (n) < (a)->num) \
fatalx("number too big"); \
if (SIZE_MAX / ((a)->num + (n)) < ARRAY_ITEMSIZE(a)) \
fatalx("size too big"); \

8
screen.c
View File

@ -1,4 +1,4 @@
/* $Id: screen.c,v 1.73 2008-09-26 06:45:26 nicm Exp $ */
/* $Id: screen.c,v 1.74 2008-09-29 16:58:02 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -93,6 +93,9 @@ screen_resize_x(struct screen *s, u_int sx)
const struct grid_cell *gc;
u_int xx, yy;
if (sx == 0)
fatalx("zero size");
/* If getting larger, not much to do. */
if (sx > screen_size_x(s)) {
gd->sx = sx;
@ -129,6 +132,9 @@ screen_resize_y(struct screen *s, u_int sy)
struct grid_data *gd = s->grid;
u_int oy, yy, ny;
if (sy == 0)
fatalx("zero size");
/* Size decreasing. */
if (sy < screen_size_y(s)) {
oy = screen_size_y(s);