Browse Source

permit calloc(0, N) and calloc(N, 0) -- malloc(0) does the right thing; markus miod ok

OPENBSD_3_2
deraadt 22 years ago
parent
commit
968c135966
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      src/lib/libc/stdlib/calloc.c

+ 2
- 2
src/lib/libc/stdlib/calloc.c View File

@ -32,7 +32,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$OpenBSD: calloc.c,v 1.6 2002/07/30 00:11:07 deraadt Exp $";
static char *rcsid = "$OpenBSD: calloc.c,v 1.7 2002/07/31 09:19:04 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include <stdlib.h> #include <stdlib.h>
@ -47,7 +47,7 @@ calloc(num, size)
{ {
register void *p; register void *p;
if (SIZE_T_MAX / num < size) {
if (num && size && SIZE_T_MAX / num < size) {
errno = ENOMEM; errno = ENOMEM;
return NULL; return NULL;
} }


Loading…
Cancel
Save