summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--monitor.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index be51642cb..9c7a78602 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 - markus@cvs.openbsd.org 2002/11/04 10:09:51 16 - markus@cvs.openbsd.org 2002/11/04 10:09:51
17 [packet.c] 17 [packet.c]
18 log before send disconnect; ok djm@ 18 log before send disconnect; ok djm@
19 - markus@cvs.openbsd.org 2002/11/05 19:45:20
20 [monitor.c]
21 handle overflows for size_t larger than u_int; siw@goneko.de, bug #425
19 22
2020021021 2320021021
21 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from 24 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
@@ -793,4 +796,4 @@
793 save auth method before monitor_reset_key_state(); bugzilla bug #284; 796 save auth method before monitor_reset_key_state(); bugzilla bug #284;
794 ok provos@ 797 ok provos@
795 798
796$Id: ChangeLog,v 1.2504 2002/11/09 15:46:24 mouring Exp $ 799$Id: ChangeLog,v 1.2505 2002/11/09 15:47:47 mouring Exp $
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)