RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2002/06/26 13:20:57 

[monitor.c]
     be careful in mm_zalloc
This commit is contained in:
Damien Miller 2002-06-26 23:27:11 +10:00
parent 136d4418e3
commit 530a754d38
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -48,6 +48,9 @@
- markus@cvs.openbsd.org 2002/06/26 08:58:26 - markus@cvs.openbsd.org 2002/06/26 08:58:26
[session.c] [session.c]
limit # of env vars to 1000; ok deraadt/djm limit # of env vars to 1000; ok deraadt/djm
- deraadt@cvs.openbsd.org 2002/06/26 13:20:57
[monitor.c]
be careful in mm_zalloc
- (djm) Require krb5 devel for RPM build w/ KrbV - (djm) Require krb5 devel for RPM build w/ KrbV
- (djm) Improve PAMAuthenticationViaKbdInt text from Nalin Dahyabhai - (djm) Improve PAMAuthenticationViaKbdInt text from Nalin Dahyabhai
<nalin@redhat.com> <nalin@redhat.com>
@ -1150,4 +1153,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2295 2002/06/26 13:05:16 djm Exp $ $Id: ChangeLog,v 1.2296 2002/06/26 13:27:11 djm Exp $

8
monitor.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.17 2002/06/22 23:09:51 stevesk Exp $"); RCSID("$OpenBSD: monitor.c,v 1.18 2002/06/26 13:20:57 deraadt Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
@ -1453,9 +1453,13 @@ 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)
{ {
int len = size * ncount;
void *address; void *address;
address = mm_malloc(mm, size * ncount); if (len <= 0)
fatal("%s: mm_zalloc(%u, %u)", __func__, ncount, size);
address = mm_malloc(mm, len);
return (address); return (address);
} }