- millert@cvs.openbsd.org 2002/08/02 14:43:15

     [monitor.c monitor_mm.c]
     Change mm_zalloc() sanity checks to be more in line with what
     we do in calloc() and add a check to monitor_mm.c.
     OK provos@ and markus@

1 files changed, 3 insertions, 3 deletions

diff --git a/monitor.c b/monitor.c
index 7da929c6d..8e7ccf894 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.22 2002/07/22 17:32:56 stevesk Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.23 2002/08/02 14:43:15 millert Exp $");
 
 #include <openssl/dh.h>
 
@@ -1454,10 +1454,10 @@ mm_get_keystate(struct monitor *pmonitor)
 void *
 mm_zalloc(struct mm_master *mm, u_int ncount, u_int size)
 {
-        int len = size * ncount;
+        size_t len = size * ncount;
         void *address;
 
-        if (len <= 0 || size > 65535 || ncount > 65535)
+        if (len == 0 || ncount > SIZE_T_MAX / size)
                 fatal("%s: mm_zalloc(%u, %u)", __func__, ncount, size);
 
         address = mm_malloc(mm, len);