From 9d6827ebb22b34e0ecf20c483a81a09ad814a5ca Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 29 Sep 2008 16:58:02 +0000
Subject: [PATCH] UINT_MAX.

---
 array.h  | 4 ++--
 screen.c | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/array.h b/array.h
index c861b075..3d96d81f 100644
--- a/array.h
+++ b/array.h
@@ -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");					\
diff --git a/screen.c b/screen.c
index 6a161bf1..9f135e25 100644
--- a/screen.c
+++ b/screen.c
@@ -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);