diff options
author | Tim Janik <timj@gtk.org> | 1999-02-18 08:13:19 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 1999-02-18 08:13:19 +0000 |
commit | af15d082a8d0259bd9528ca4bd711fe010f34abe (patch) | |
tree | 11da65d09097a2e42f9def7387c9d46d41147497 | |
parent | 260fabb67a5ca0c29fc168ba8b81b2625827fc58 (diff) | |
download | glib-af15d082a8d0259bd9528ca4bd711fe010f34abe.tar.gz |
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.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-12 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
-rw-r--r-- | glib/gmem.c | 8 | ||||
-rw-r--r-- | gmem.c | 8 |
10 files changed, 52 insertions, 4 deletions
@@ -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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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) @@ -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) |