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.
This commit is contained in:
Owen Taylor 2002-03-22 23:01:01 +00:00 committed by Owen Taylor
parent 20b0580be1
commit 5b492c98cb
8 changed files with 46 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 ();
}