From 39e71188522626d9d6c7df8064255f7da06b5ca7 Mon Sep 17 00:00:00 2001 From: mouring Date: Sat, 9 Nov 2002 15:47:47 +0000 Subject: [PATCH] - 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 --- ChangeLog | 3 +++ monitor.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae04d4c5..d256bd93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ - markus@cvs.openbsd.org 2002/11/04 10:09:51 [packet.c] log before send disconnect; ok djm@ + - 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 20021021 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from diff --git a/monitor.c b/monitor.c index 4ad3f3d2..b91cfded 100644 --- a/monitor.c +++ b/monitor.c @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor.c,v 1.29 2002/09/26 11:38:43 markus Exp $"); +RCSID("$OpenBSD: monitor.c,v 1.30 2002/11/05 19:45:20 markus Exp $"); #include @@ -1551,7 +1551,7 @@ mm_get_keystate(struct monitor *pmonitor) void * mm_zalloc(struct mm_master *mm, u_int ncount, u_int size) { - size_t len = size * ncount; + size_t len = (size_t) size * ncount; void *address; if (len == 0 || ncount > SIZE_T_MAX / size) -- 2.45.2