tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Ben Lindstrom 2002-11-09 15:47:47 +00:00
parent 9bda7ae4c6
commit 41ee2b0d77
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -16,6 +16,9 @@
- markus@cvs.openbsd.org 2002/11/04 10:09:51 - markus@cvs.openbsd.org 2002/11/04 10:09:51
[packet.c] [packet.c]
log before send disconnect; ok djm@ 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 20021021
- (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
@ -793,4 +796,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2504 2002/11/09 15:46:24 mouring Exp $ $Id: ChangeLog,v 1.2505 2002/11/09 15:47:47 mouring Exp $

4
monitor.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #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 <openssl/dh.h> #include <openssl/dh.h>
@ -1551,7 +1551,7 @@ mm_get_keystate(struct monitor *pmonitor)
void * void *
mm_zalloc(struct mm_master *mm, u_int ncount, u_int size) 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; void *address;
if (len == 0 || ncount > SIZE_T_MAX / size) if (len == 0 || ncount > SIZE_T_MAX / size)