1 files changed, 10 insertions, 4 deletions

diff --git a/src/lib/libc/stdlib/calloc.c b/src/lib/libc/stdlib/calloc.c
index 3353fab052..c75b256d14 100644
--- a/src/lib/libc/stdlib/calloc.c
+++ b/src/lib/libc/stdlib/calloc.c
@@ -32,12 +32,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)calloc.c     5.6 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: calloc.c,v 1.1.1.1 1995/10/18 08:42:17 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 */
 
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
+#include <errno.h>
 
 void *
 calloc(num, size)
@@ -46,8 +47,13 @@ calloc(num, size)
 {
         register void *p;
 
+        if (num && size && SIZE_T_MAX / num < size) {
+                errno = ENOMEM;
+                return NULL;
+        }
         size *= num;
-        if (p = malloc(size))
-                memset(p, '\0', size);
+        p = malloc(size);
+        if (p)
+                memset(p, 0, size);
         return(p);
 }