From 2109301afa188ac654e900116dd52da61ac2d535 Mon Sep 17 00:00:00 2001 From: jason <> Date: Wed, 31 Jul 2002 16:40:07 +0000 Subject: [PATCH] Pull in patch from current: Fix (deraadt): permit calloc(0, N) and calloc(N, 0) -- malloc(0) does the right thing --- src/lib/libc/stdlib/calloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/libc/stdlib/calloc.c b/src/lib/libc/stdlib/calloc.c index d8b2f0dd..ab81ebfe 100644 --- a/src/lib/libc/stdlib/calloc.c +++ b/src/lib/libc/stdlib/calloc.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: calloc.c,v 1.5.10.1 2002/07/30 14:51:20 jason Exp $"; +static char *rcsid = "$OpenBSD: calloc.c,v 1.5.10.2 2002/07/31 16:40:07 jason Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -47,7 +47,7 @@ calloc(num, size) { register void *p; - if (SIZE_T_MAX / num < size) { + if (num && size && SIZE_T_MAX / num < size) { errno = ENOMEM; return NULL; }