From 5b492c98cb6264bcd6fd89a8b1c42a9914f89a3a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 22 Mar 2002 23:01:01 +0000 Subject: [PATCH] Fix problem where if g_mem_chunk_reset() is called on an alloc-only Fri Mar 22 17:59:27 2002 Owen Taylor * glib/gmem.c (g_mem_chunk_reset): Fix problem where if g_mem_chunk_reset() is called on an alloc-only memchunk, then a useles GTree was created. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gmem.c | 6 ++++-- 8 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f32eb501..65935d526 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 22 17:59:27 2002 Owen Taylor + + * glib/gmem.c (g_mem_chunk_reset): Fix problem where + if g_mem_chunk_reset() is called on an alloc-only + memchunk, then a useles GTree was created. + Wed Mar 20 18:20:21 2002 Owen Taylor * glib/gconvert.c (open_converter): Try to work around segfaults diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7f32eb501..65935d526 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Mar 22 17:59:27 2002 Owen Taylor + + * glib/gmem.c (g_mem_chunk_reset): Fix problem where + if g_mem_chunk_reset() is called on an alloc-only + memchunk, then a useles GTree was created. + Wed Mar 20 18:20:21 2002 Owen Taylor * glib/gconvert.c (open_converter): Try to work around segfaults diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 7f32eb501..65935d526 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Fri Mar 22 17:59:27 2002 Owen Taylor + + * glib/gmem.c (g_mem_chunk_reset): Fix problem where + if g_mem_chunk_reset() is called on an alloc-only + memchunk, then a useles GTree was created. + Wed Mar 20 18:20:21 2002 Owen Taylor * glib/gconvert.c (open_converter): Try to work around segfaults diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7f32eb501..65935d526 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Mar 22 17:59:27 2002 Owen Taylor + + * glib/gmem.c (g_mem_chunk_reset): Fix problem where + if g_mem_chunk_reset() is called on an alloc-only + memchunk, then a useles GTree was created. + Wed Mar 20 18:20:21 2002 Owen Taylor * glib/gconvert.c (open_converter): Try to work around segfaults diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7f32eb501..65935d526 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Mar 22 17:59:27 2002 Owen Taylor + + * glib/gmem.c (g_mem_chunk_reset): Fix problem where + if g_mem_chunk_reset() is called on an alloc-only + memchunk, then a useles GTree was created. + Wed Mar 20 18:20:21 2002 Owen Taylor * glib/gconvert.c (open_converter): Try to work around segfaults diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7f32eb501..65935d526 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Mar 22 17:59:27 2002 Owen Taylor + + * glib/gmem.c (g_mem_chunk_reset): Fix problem where + if g_mem_chunk_reset() is called on an alloc-only + memchunk, then a useles GTree was created. + Wed Mar 20 18:20:21 2002 Owen Taylor * glib/gconvert.c (open_converter): Try to work around segfaults diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7f32eb501..65935d526 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Mar 22 17:59:27 2002 Owen Taylor + + * glib/gmem.c (g_mem_chunk_reset): Fix problem where + if g_mem_chunk_reset() is called on an alloc-only + memchunk, then a useles GTree was created. + Wed Mar 20 18:20:21 2002 Owen Taylor * glib/gconvert.c (open_converter): Try to work around segfaults diff --git a/glib/gmem.c b/glib/gmem.c index 7329aee9d..5ffe06a80 100644 --- a/glib/gmem.c +++ b/glib/gmem.c @@ -1021,8 +1021,10 @@ g_mem_chunk_reset (GMemChunk *mem_chunk) mem_chunk->free_atoms = NULL; if (mem_chunk->mem_tree) - g_tree_destroy (mem_chunk->mem_tree); - mem_chunk->mem_tree = g_tree_new ((GCompareFunc) g_mem_chunk_area_compare); + { + g_tree_destroy (mem_chunk->mem_tree); + mem_chunk->mem_tree = g_tree_new ((GCompareFunc) g_mem_chunk_area_compare); + } LEAVE_MEM_CHUNK_ROUTINE (); }