From af15d082a8d0259bd9528ca4bd711fe010f34abe Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 18 Feb 1999 08:13:19 +0000 Subject: [PATCH] plugged a memory leak, reported by Koen D'Hondt on 15 Thu Feb 18 08:24:12 1999 Tim Janik * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt on 15 Oct 1998. allocate inital block from realloc. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gmem.c | 8 ++++++-- gmem.c | 8 ++++++-- 10 files changed, 52 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 467999e0e..037d78ef7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 18 08:24:12 1999 Tim Janik + + * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt + on 15 Oct 1998. allocate inital block from realloc. + 1999-02-17 Elliot Lee * glib.spec: Do --enable-debug=no for the .rpm's. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 467999e0e..037d78ef7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Feb 18 08:24:12 1999 Tim Janik + + * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt + on 15 Oct 1998. allocate inital block from realloc. + 1999-02-17 Elliot Lee * glib.spec: Do --enable-debug=no for the .rpm's. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 467999e0e..037d78ef7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Feb 18 08:24:12 1999 Tim Janik + + * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt + on 15 Oct 1998. allocate inital block from realloc. + 1999-02-17 Elliot Lee * glib.spec: Do --enable-debug=no for the .rpm's. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 467999e0e..037d78ef7 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Thu Feb 18 08:24:12 1999 Tim Janik + + * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt + on 15 Oct 1998. allocate inital block from realloc. + 1999-02-17 Elliot Lee * glib.spec: Do --enable-debug=no for the .rpm's. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 467999e0e..037d78ef7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Feb 18 08:24:12 1999 Tim Janik + + * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt + on 15 Oct 1998. allocate inital block from realloc. + 1999-02-17 Elliot Lee * glib.spec: Do --enable-debug=no for the .rpm's. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 467999e0e..037d78ef7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Feb 18 08:24:12 1999 Tim Janik + + * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt + on 15 Oct 1998. allocate inital block from realloc. + 1999-02-17 Elliot Lee * glib.spec: Do --enable-debug=no for the .rpm's. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 467999e0e..037d78ef7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Feb 18 08:24:12 1999 Tim Janik + + * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt + on 15 Oct 1998. allocate inital block from realloc. + 1999-02-17 Elliot Lee * glib.spec: Do --enable-debug=no for the .rpm's. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 467999e0e..037d78ef7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Feb 18 08:24:12 1999 Tim Janik + + * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt + on 15 Oct 1998. allocate inital block from realloc. + 1999-02-17 Elliot Lee * glib.spec: Do --enable-debug=no for the .rpm's. diff --git a/glib/gmem.c b/glib/gmem.c index e7e215dfd..a6c3c0991 100644 --- 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 index e7e215dfd..a6c3c0991 100644 --- 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)