Fix the locking of the mem_chunks list. (#127096, Balazs Scheidler)

Sun Dec 21 22:42:42 2003  Matthias Clasen  <maclas@gmx.de>

	* glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the
	mem_chunks list.  (#127096, Balazs Scheidler)

diff --git a/ChangeLog b/ChangeLog
index ae3851059957473cb82f2de50180cf6289a088b1..58e278ac36224b76ed679d93bfaae859e440715a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 21 22:42:42 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the
+       mem_chunks list.  (#127096, Balazs Scheidler)
+
 2003-12-14  Hans Breuer  <hans@breuer.org>
 
        * glib/gfileutils.c : make g_file_test(,G_FILE_TEST_IS_EXECUTABLE)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ae3851059957473cb82f2de50180cf6289a088b1..58e278ac36224b76ed679d93bfaae859e440715a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Dec 21 22:42:42 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the
+       mem_chunks list.  (#127096, Balazs Scheidler)
+
 2003-12-14  Hans Breuer  <hans@breuer.org>
 
        * glib/gfileutils.c : make g_file_test(,G_FILE_TEST_IS_EXECUTABLE)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ae3851059957473cb82f2de50180cf6289a088b1..58e278ac36224b76ed679d93bfaae859e440715a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Sun Dec 21 22:42:42 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the
+       mem_chunks list.  (#127096, Balazs Scheidler)
+
 2003-12-14  Hans Breuer  <hans@breuer.org>
 
        * glib/gfileutils.c : make g_file_test(,G_FILE_TEST_IS_EXECUTABLE)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ae3851059957473cb82f2de50180cf6289a088b1..58e278ac36224b76ed679d93bfaae859e440715a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Dec 21 22:42:42 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the
+       mem_chunks list.  (#127096, Balazs Scheidler)
+
 2003-12-14  Hans Breuer  <hans@breuer.org>
 
        * glib/gfileutils.c : make g_file_test(,G_FILE_TEST_IS_EXECUTABLE)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ae3851059957473cb82f2de50180cf6289a088b1..58e278ac36224b76ed679d93bfaae859e440715a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Dec 21 22:42:42 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the
+       mem_chunks list.  (#127096, Balazs Scheidler)
+
 2003-12-14  Hans Breuer  <hans@breuer.org>
 
        * glib/gfileutils.c : make g_file_test(,G_FILE_TEST_IS_EXECUTABLE)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ae3851059957473cb82f2de50180cf6289a088b1..58e278ac36224b76ed679d93bfaae859e440715a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Dec 21 22:42:42 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the
+       mem_chunks list.  (#127096, Balazs Scheidler)
+
 2003-12-14  Hans Breuer  <hans@breuer.org>
 
        * glib/gfileutils.c : make g_file_test(,G_FILE_TEST_IS_EXECUTABLE)

diff --git a/glib/gmem.c b/glib/gmem.c
index 9fbbb80e73f9be05dda582627b95bc6566fba250..d9304857ef3c0548071faafd4022d9d3bf828f90 100644 (file)
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -717,12 +717,12 @@ g_mem_chunk_destroy (GMemChunk *mem_chunk)
       g_free (temp_area);
     }
   
+  g_mutex_lock (mem_chunks_lock);
   if (mem_chunk->next)
     mem_chunk->next->prev = mem_chunk->prev;
   if (mem_chunk->prev)
     mem_chunk->prev->next = mem_chunk->next;
   
-  g_mutex_lock (mem_chunks_lock);
   if (mem_chunk == mem_chunks)
     mem_chunks = mem_chunks->next;
   g_mutex_unlock (mem_chunks_lock);