plugged a memory leak, reported by Koen D'Hondt <ripley@xs4all.nl> on 15

Thu Feb 18 08:24:12 1999 Tim Janik <timj@gtk.org> * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt <ripley@xs4all.nl> on 15 Oct 1998. allocate inital block from realloc.
dieterv · Feb 18, 1999 · af15d08 · af15d08
1 parent 260fabb
commit af15d08
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
+
+	* gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt
+	<ripley@xs4all.nl> on 15 Oct 1998. allocate inital block from realloc.
+
 1999-02-17  Elliot Lee  <sopwith@redhat.com>
 
 	* glib.spec: Do --enable-debug=no for the .rpm's.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
+
+	* gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt
+	<ripley@xs4all.nl> on 15 Oct 1998. allocate inital block from realloc.
+
 1999-02-17  Elliot Lee  <sopwith@redhat.com>
 
 	* glib.spec: Do --enable-debug=no for the .rpm's.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
+
+	* gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt
+	<ripley@xs4all.nl> on 15 Oct 1998. allocate inital block from realloc.
+
 1999-02-17  Elliot Lee  <sopwith@redhat.com>
 
 	* glib.spec: Do --enable-debug=no for the .rpm's.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
+
+	* gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt
+	<ripley@xs4all.nl> on 15 Oct 1998. allocate inital block from realloc.
+
 1999-02-17  Elliot Lee  <sopwith@redhat.com>
 
 	* glib.spec: Do --enable-debug=no for the .rpm's.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
+
+	* gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt
+	<ripley@xs4all.nl> on 15 Oct 1998. allocate inital block from realloc.
+
 1999-02-17  Elliot Lee  <sopwith@redhat.com>
 
 	* glib.spec: Do --enable-debug=no for the .rpm's.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
+
+	* gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt
+	<ripley@xs4all.nl> on 15 Oct 1998. allocate inital block from realloc.
+
 1999-02-17  Elliot Lee  <sopwith@redhat.com>
 
 	* glib.spec: Do --enable-debug=no for the .rpm's.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
+
+	* gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt
+	<ripley@xs4all.nl> on 15 Oct 1998. allocate inital block from realloc.
+
 1999-02-17  Elliot Lee  <sopwith@redhat.com>
 
 	* glib.spec: Do --enable-debug=no for the .rpm's.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
+
+	* gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt
+	<ripley@xs4all.nl> on 15 Oct 1998. allocate inital block from realloc.
+
 1999-02-17  Elliot Lee  <sopwith@redhat.com>
 
 	* glib.spec: Do --enable-debug=no for the .rpm's.

diff --git a/glib/gmem.c b/glib/gmem.c
@@ -285,7 +285,11 @@ g_realloc (gpointer mem,
 
 
   if (size == 0)
-    return NULL;
+    {
+      g_free (mem);
+
+      return NULL;
+    }
 
 
 #if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
@@ -298,7 +302,7 @@ g_realloc (gpointer mem,
 
 
   if (!mem)
-    p = (gpointer) malloc (size);
+    p = (gpointer) realloc (NULL, size);
   else
     {
 #if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)

diff --git a/gmem.c b/gmem.c
@@ -285,7 +285,11 @@ g_realloc (gpointer mem,
 
 
   if (size == 0)
-    return NULL;
+    {
+      g_free (mem);
+
+      return NULL;
+    }
 
 
 #if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
@@ -298,7 +302,7 @@ g_realloc (gpointer mem,
 
 
   if (!mem)
-    p = (gpointer) malloc (size);
+    p = (gpointer) realloc (NULL, size);
   else
     {
 #if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)