Only set vtable_set if the vtable is set.

diff --git a/ChangeLog b/ChangeLog
index 9a1078b..e2192d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmem.c (g_mem_set_vtable): Only set vtable_set if the
+       vtable is set.  (#154352, Philippe Blain)
+
 2004-10-03  Anders Carlsson  <andersca@gnome.org>
 
        * glib/goption.c: (parse_arg):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9a1078b..e2192d7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmem.c (g_mem_set_vtable): Only set vtable_set if the
+       vtable is set.  (#154352, Philippe Blain)
+
 2004-10-03  Anders Carlsson  <andersca@gnome.org>
 
        * glib/goption.c: (parse_arg):

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9a1078b..e2192d7 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-10-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmem.c (g_mem_set_vtable): Only set vtable_set if the
+       vtable is set.  (#154352, Philippe Blain)
+
 2004-10-03  Anders Carlsson  <andersca@gnome.org>
 
        * glib/goption.c: (parse_arg):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9a1078b..e2192d7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmem.c (g_mem_set_vtable): Only set vtable_set if the
+       vtable is set.  (#154352, Philippe Blain)
+
 2004-10-03  Anders Carlsson  <andersca@gnome.org>
 
        * glib/goption.c: (parse_arg):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9a1078b..e2192d7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmem.c (g_mem_set_vtable): Only set vtable_set if the
+       vtable is set.  (#154352, Philippe Blain)
+
 2004-10-03  Anders Carlsson  <andersca@gnome.org>
 
        * glib/goption.c: (parse_arg):

diff --git a/glib/gmem.c b/glib/gmem.c
index d114927..0a07be4 100644 (file)
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -248,7 +248,6 @@ g_mem_set_vtable (GMemVTable *vtable)
 {
   if (!vtable_set)
     {
-      vtable_set = TRUE;
       if (vtable->malloc && vtable->realloc && vtable->free)
        {
          glib_mem_vtable.malloc = vtable->malloc;
@@ -257,6 +256,7 @@ g_mem_set_vtable (GMemVTable *vtable)
          glib_mem_vtable.calloc = vtable->calloc ? vtable->calloc : fallback_calloc;
          glib_mem_vtable.try_malloc = vtable->try_malloc ? vtable->try_malloc : glib_mem_vtable.malloc;
          glib_mem_vtable.try_realloc = vtable->try_realloc ? vtable->try_realloc : glib_mem_vtable.realloc;
+         vtable_set = TRUE;
        }
       else
        g_warning (G_STRLOC ": memory allocation vtable lacks one of malloc(), realloc() or free()");