Libc-1158.50.2.tar.gz

[apple/libc.git] / stdlib / FreeBSD / reallocf.c

diff --git a/stdlib/FreeBSD/reallocf.c b/stdlib/FreeBSD/reallocf.c
index d502006229da174163514c436f06c762a7f2817c..a85b5a3c036be84ec82cb2514774b126029f1b8b 100644 (file)
--- a/stdlib/FreeBSD/reallocf.c
+++ b/stdlib/FreeBSD/reallocf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/stdlib/reallocf.c,v 1.4 2002/03/22 21:53:10 obrien Exp $");
+__FBSDID("$FreeBSD$");

 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 


@@ -35,7 +35,14 @@ reallocf(void *ptr, size_t size)
        void *nptr;
 
        nptr = realloc(ptr, size);
        void *nptr;
 
        nptr = realloc(ptr, size);

-       if (!nptr && ptr)
+
+       /*
+        * When the System V compatibility option (malloc "V" flag) is
+        * in effect, realloc(ptr, 0) frees the memory and returns NULL.
+        * So, to avoid double free, call free() only when size != 0.
+        * realloc(ptr, 0) can't fail when ptr != NULL.
+        */
+       if (!nptr && ptr && size != 0)

                free(ptr);
        return (nptr);
 }
                free(ptr);
        return (nptr);
 }