summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-11-09 15:47:47 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-11-09 15:47:47 +0000
commit41ee2b0d77b1d890bc284972aaf5d8935a0c1893 (patch)
tree52687d89b7abc1a15270255bf106d31f2c608e21 /monitor.c
parent9bda7ae4c695a0ff78e570151c067a62c5e44de6 (diff)
- markus@cvs.openbsd.org 2002/11/05 19:45:20
[monitor.c] handle overflows for size_t larger than u_int; siw@goneko.de, bug #425
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index 4ad3f3d21..b91cfdeda 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.29 2002/09/26 11:38:43 markus Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.30 2002/11/05 19:45:20 markus Exp $");
29 29
30#include <openssl/dh.h> 30#include <openssl/dh.h>
31 31
@@ -1551,7 +1551,7 @@ mm_get_keystate(struct monitor *pmonitor)
1551void * 1551void *
1552mm_zalloc(struct mm_master *mm, u_int ncount, u_int size) 1552mm_zalloc(struct mm_master *mm, u_int ncount, u_int size)
1553{ 1553{
1554 size_t len = size * ncount; 1554 size_t len = (size_t) size * ncount;
1555 void *address; 1555 void *address;
1556 1556
1557 if (len == 0 || ncount > SIZE_T_MAX / size) 1557 if (len == 0 || ncount > SIZE_T_MAX / size)