From: Jim Meyering <jim@meyering.net>
Date: Thu, 16 Jun 2005 14:52:29 +0000 (+0000)
Subject: (rpl_calloc): Allocate a 1-byte buffer (not 1xS or Nx1)
X-Git-Tag: CPPI-1_12~585
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5371690c7f7d08b4064827f14f4af947df0b6f4e;p=thirdparty%2Fcoreutils.git

(rpl_calloc): Allocate a 1-byte buffer (not 1xS or Nx1)
when either N or S is zero.
---

diff --git a/lib/calloc.c b/lib/calloc.c
index 59c65f0ac9..9edbf45523 100644
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -1,6 +1,6 @@
 /* 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 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
@@ -32,10 +32,9 @@ void *
 rpl_calloc (size_t n, size_t s)
 {
   size_t bytes;
-  if (n == 0)
-    n = 1;
-  if (s == 0)
-    s = 1;
+
+  if (n == 0 || s == 0)
+    return calloc (1, 1);
 
   /* Defend against buggy calloc implementations that mishandle
      size_t overflow.  */