diff options
author | jason <> | 2002-07-30 14:51:20 +0000 |
---|---|---|
committer | jason <> | 2002-07-30 14:51:20 +0000 |
commit | 61f51d1b1714d7f1eb3350fed1b78632ef17c937 (patch) | |
tree | 2ba86e079143565045a5fc617124bb91cafec00f | |
parent | 911d2dd3c6f0afe96b64dbfdf6667f77b5eff10c (diff) | |
download | openbsd-61f51d1b1714d7f1eb3350fed1b78632ef17c937.tar.gz openbsd-61f51d1b1714d7f1eb3350fed1b78632ef17c937.tar.bz2 openbsd-61f51d1b1714d7f1eb3350fed1b78632ef17c937.zip |
Pull in patch from current:
Fix (deraadt):
return failure if integer overflow happens. sigh; too people had to
help get this right.
-rw-r--r-- | src/lib/libc/stdlib/calloc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libc/stdlib/calloc.c b/src/lib/libc/stdlib/calloc.c index e79d71f93e..d8b2f0dd46 100644 --- a/src/lib/libc/stdlib/calloc.c +++ b/src/lib/libc/stdlib/calloc.c | |||
@@ -32,11 +32,13 @@ | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #if defined(LIBC_SCCS) && !defined(lint) | 34 | #if defined(LIBC_SCCS) && !defined(lint) |
35 | static char *rcsid = "$OpenBSD: calloc.c,v 1.5 1999/11/10 20:12:31 millert Exp $"; | 35 | static char *rcsid = "$OpenBSD: calloc.c,v 1.5.10.1 2002/07/30 14:51:20 jason Exp $"; |
36 | #endif /* LIBC_SCCS and not lint */ | 36 | #endif /* LIBC_SCCS and not lint */ |
37 | 37 | ||
38 | #include <stdlib.h> | 38 | #include <stdlib.h> |
39 | #include <string.h> | 39 | #include <string.h> |
40 | #include <limits.h> | ||
41 | #include <errno.h> | ||
40 | 42 | ||
41 | void * | 43 | void * |
42 | calloc(num, size) | 44 | calloc(num, size) |
@@ -45,6 +47,10 @@ calloc(num, size) | |||
45 | { | 47 | { |
46 | register void *p; | 48 | register void *p; |
47 | 49 | ||
50 | if (SIZE_T_MAX / num < size) { | ||
51 | errno = ENOMEM; | ||
52 | return NULL; | ||
53 | } | ||
48 | size *= num; | 54 | size *= num; |
49 | p = malloc(size); | 55 | p = malloc(size); |
50 | if (p) | 56 | if (p) |