X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcalloc.c;h=c8b1e1ebabd0d29c791b333b6f16234b45ebc254;hb=2354d5ead305b61c925e53bcfb73d47de7c53162;hp=2a9e6fa20e681f09616e48fd9143f0f86f90d403;hpb=bf6364cb9f7888c0bb13f4290ba45939dbc9708c;p=gnulib.git

diff --git a/lib/calloc.c b/lib/calloc.c
index 2a9e6fa20..c8b1e1eba 100644
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -1,6 +1,6 @@
-/* Work around the condition whereby calloc (n, s) fails when n*s is 0.
+/* calloc() function that is glibc compatible.
    This wrapper function is required at least on Tru64 UNIX 5.1.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,13 +14,11 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef calloc
 
 #include <stdlib.h>
@@ -31,9 +29,16 @@
 void *
 rpl_calloc (size_t n, size_t s)
 {
-  if (n == 0)
-    n = 1;
-  if (s == 0)
-    s = 1;
+  size_t bytes;
+
+  if (n == 0 || s == 0)
+    return calloc (1, 1);
+
+  /* Defend against buggy calloc implementations that mishandle
+     size_t overflow.  */
+  bytes = n * s;
+  if (bytes / s != n)
+    return NULL;
+
   return calloc (n, s);
 }