diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-04 00:05:06 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-04 00:05:06 +0000 |
commit | 35a2cb9b41c2828ad2585b01689281bb22e29596 (patch) | |
tree | 3f6d39ee2273e5c10ab2b9a8ffb82100fe93db1c | |
parent | 04f9af7dfcac6a2230bbb574ea8ddaa5e39baa04 (diff) |
- deraadt@cvs.openbsd.org 2002/06/27 09:08:00
[monitor.c]
improve mm_zalloc check; markus ok
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | monitor.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -6,6 +6,9 @@ | |||
6 | - markus@cvs.openbsd.org 2002/06/27 08:49:44 | 6 | - markus@cvs.openbsd.org 2002/06/27 08:49:44 |
7 | [dh.c ssh-keyscan.c sshconnect.c] | 7 | [dh.c ssh-keyscan.c sshconnect.c] |
8 | more checks for NULL pointers; from grendel@zeitbombe.org; ok deraadt@ | 8 | more checks for NULL pointers; from grendel@zeitbombe.org; ok deraadt@ |
9 | - deraadt@cvs.openbsd.org 2002/06/27 09:08:00 | ||
10 | [monitor.c] | ||
11 | improve mm_zalloc check; markus ok | ||
9 | 12 | ||
10 | 20020702 | 13 | 20020702 |
11 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & | 14 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & |
@@ -1214,4 +1217,4 @@ | |||
1214 | - (stevesk) entropy.c: typo in debug message | 1217 | - (stevesk) entropy.c: typo in debug message |
1215 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1218 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1216 | 1219 | ||
1217 | $Id: ChangeLog,v 1.2316 2002/07/04 00:03:56 mouring Exp $ | 1220 | $Id: ChangeLog,v 1.2317 2002/07/04 00:05:06 mouring Exp $ |
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.19 2002/06/26 14:49:36 deraadt Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.20 2002/06/27 09:08:00 deraadt Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -1456,7 +1456,7 @@ mm_zalloc(struct mm_master *mm, u_int ncount, u_int size) | |||
1456 | int len = size * ncount; | 1456 | int len = size * ncount; |
1457 | void *address; | 1457 | void *address; |
1458 | 1458 | ||
1459 | if (len <= 0) | 1459 | if (len <= 0 || size > 65535 || ncount > 65535) |
1460 | fatal("%s: mm_zalloc(%u, %u)", __func__, ncount, size); | 1460 | fatal("%s: mm_zalloc(%u, %u)", __func__, ncount, size); |
1461 | 1461 | ||
1462 | address = mm_malloc(mm, len); | 1462 | address = mm_malloc(mm, len); |