1 files changed, 25 insertions, 1 deletions

diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 8b90bb5d57..3582d7980c 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -8,7 +8,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: malloc.c,v 1.36 1999/09/16 19:06:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: malloc.c,v 1.37 1999/11/09 19:25:33 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -1278,3 +1278,27 @@ realloc(void *ptr, size_t size)
         wrterror("out of memory.\n");
     return (r);
 }
+
+void *
+calloc(size_t num, size_t size)
+{
+    register void *r;
+
+    malloc_func = " in calloc():";
+    THREAD_LOCK();
+    if (malloc_active++) {
+        wrtwarning("recursive call.\n");
+        malloc_active--;
+        return (0);
+    }
+    size *= num;
+    r = imalloc(size);
+    if (r && !malloc_zero)
+        memset(r, 0, size)
+    UTRACE(0, size, r);
+    malloc_active--;
+    THREAD_UNLOCK();
+    if (malloc_xmalloc && !r)
+        wrterror("out of memory.\n");
+    return (r);
+}