From 4c30c5cc8951a3a1a15fef4ee74782b9a54bc218 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Wed, 31 Jul 2002 09:25:20 +0000
Subject: [PATCH] MFC (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 a9e49e39..b944df6f 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.8.1 2002/07/30 07:31:20 miod Exp $";
+static char *rcsid = "$OpenBSD: calloc.c,v 1.5.8.2 2002/07/31 09:25:20 miod Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
@@ -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;
 	}