diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | monitor.c | 8 |
2 files changed, 10 insertions, 3 deletions
@@ -48,6 +48,9 @@ | |||
48 | - markus@cvs.openbsd.org 2002/06/26 08:58:26 | 48 | - markus@cvs.openbsd.org 2002/06/26 08:58:26 |
49 | [session.c] | 49 | [session.c] |
50 | limit # of env vars to 1000; ok deraadt/djm | 50 | limit # of env vars to 1000; ok deraadt/djm |
51 | - deraadt@cvs.openbsd.org 2002/06/26 13:20:57 | ||
52 | [monitor.c] | ||
53 | be careful in mm_zalloc | ||
51 | - (djm) Require krb5 devel for RPM build w/ KrbV | 54 | - (djm) Require krb5 devel for RPM build w/ KrbV |
52 | - (djm) Improve PAMAuthenticationViaKbdInt text from Nalin Dahyabhai | 55 | - (djm) Improve PAMAuthenticationViaKbdInt text from Nalin Dahyabhai |
53 | <nalin@redhat.com> | 56 | <nalin@redhat.com> |
@@ -1150,4 +1153,4 @@ | |||
1150 | - (stevesk) entropy.c: typo in debug message | 1153 | - (stevesk) entropy.c: typo in debug message |
1151 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1154 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1152 | 1155 | ||
1153 | $Id: ChangeLog,v 1.2295 2002/06/26 13:05:16 djm Exp $ | 1156 | $Id: ChangeLog,v 1.2296 2002/06/26 13:27:11 djm Exp $ |
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.17 2002/06/22 23:09:51 stevesk Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.18 2002/06/26 13:20:57 deraadt Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -1453,9 +1453,13 @@ mm_get_keystate(struct monitor *pmonitor) | |||
1453 | void * | 1453 | void * |
1454 | mm_zalloc(struct mm_master *mm, u_int ncount, u_int size) | 1454 | mm_zalloc(struct mm_master *mm, u_int ncount, u_int size) |
1455 | { | 1455 | { |
1456 | int len = size * ncount; | ||
1456 | void *address; | 1457 | void *address; |
1457 | 1458 | ||
1458 | address = mm_malloc(mm, size * ncount); | 1459 | if (len <= 0) |
1460 | fatal("%s: mm_zalloc(%u, %u)", __func__, ncount, size); | ||
1461 | |||
1462 | address = mm_malloc(mm, len); | ||
1459 | 1463 | ||
1460 | return (address); | 1464 | return (address); |
1461 | } | 1465 | } |