Fix problem where if g_mem_chunk_reset() is called on an alloc-only

Fri Mar 22 17:59:27 2002  Owen Taylor  <otaylor@redhat.com>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index 7f32eb5..65935d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 22 17:59:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gconvert.c (open_converter): Try to work around segfaults

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7f32eb5..65935d5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Mar 22 17:59:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gconvert.c (open_converter): Try to work around segfaults

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 7f32eb5..65935d5 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Fri Mar 22 17:59:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gconvert.c (open_converter): Try to work around segfaults

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7f32eb5..65935d5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Mar 22 17:59:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gconvert.c (open_converter): Try to work around segfaults

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7f32eb5..65935d5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Mar 22 17:59:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gconvert.c (open_converter): Try to work around segfaults

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7f32eb5..65935d5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Mar 22 17:59:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gconvert.c (open_converter): Try to work around segfaults

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7f32eb5..65935d5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Mar 22 17:59:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * glib/gconvert.c (open_converter): Try to work around segfaults

diff --git a/glib/gmem.c b/glib/gmem.c
index 7329aee..5ffe06a 100644 (file)
--- 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 ();
 }