xmalloc: Do not leak if underlying realloc is C99 compatible.

* lib/xmalloc.c (xrealloc): If N is zero, call 'free' directly.
This avoids a leak on C99-based systems.  See
<http://lists.gnu.org/archive/html/bug-gnulib/2011-03/msg00243.html>.

diff --git a/ChangeLog b/ChangeLog
index 58f81959cb1d54548a67d8275535ae08f88ce6bf..c58e13c4837894eb2a796c4abbb45d280d38caf8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       xmalloc: Do not leak if underlying realloc is C99 compatible.
+       * lib/xmalloc.c (xrealloc): If N is zero, call 'free' directly.
+       This avoids a leak on C99-based systems.  See
+       <http://lists.gnu.org/archive/html/bug-gnulib/2011-03/msg00243.html>.
+
 2011-03-24  Eric Blake  <eblake@redhat.com>
 
        realloc: document portability problem

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 74a8614b6c539b93efd949fd8db6d7fd4d4ad7e3..4589e7d74e7b795f79a3b544e6aeaf912a35a32a 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -52,8 +52,16 @@ xmalloc (size_t n)
 void *
 xrealloc (void *p, size_t n)
 {
+  if (!n)
+    {
+      /* The GNU and C99 realloc behaviors disagree here.  Act like
+         GNU, even if the underlying realloc is C99.  */
+      free (p);
+      return NULL;
+    }
+
   p = realloc (p, n);
-  if (!p && n != 0)
+  if (!p)
     xalloc_die ();
   return p;
 }