From 53e132ed398f7c6b305093112b9548cb5017616c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 21 Dec 2003 21:51:39 +0000 Subject: [PATCH] Fix the locking of the mem_chunks list. (#127096, Balazs Scheidler) Sun Dec 21 22:42:42 2003 Matthias Clasen * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the mem_chunks list. (#127096, Balazs Scheidler) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gmem.c | 2 +- 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ae38510..58e278a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Dec 21 22:42:42 2003 Matthias Clasen + + * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the + mem_chunks list. (#127096, Balazs Scheidler) + 2003-12-14 Hans Breuer * 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 ae38510..58e278a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Dec 21 22:42:42 2003 Matthias Clasen + + * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the + mem_chunks list. (#127096, Balazs Scheidler) + 2003-12-14 Hans Breuer * 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 ae38510..58e278a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sun Dec 21 22:42:42 2003 Matthias Clasen + + * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the + mem_chunks list. (#127096, Balazs Scheidler) + 2003-12-14 Hans Breuer * 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 ae38510..58e278a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Dec 21 22:42:42 2003 Matthias Clasen + + * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the + mem_chunks list. (#127096, Balazs Scheidler) + 2003-12-14 Hans Breuer * 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 ae38510..58e278a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Dec 21 22:42:42 2003 Matthias Clasen + + * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the + mem_chunks list. (#127096, Balazs Scheidler) + 2003-12-14 Hans Breuer * 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 ae38510..58e278a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Dec 21 22:42:42 2003 Matthias Clasen + + * glib/gmem.c (g_mem_chunk_destroy): Fix the locking of the + mem_chunks list. (#127096, Balazs Scheidler) + 2003-12-14 Hans Breuer * glib/gfileutils.c : make g_file_test(,G_FILE_TEST_IS_EXECUTABLE) diff --git a/glib/gmem.c b/glib/gmem.c index 9fbbb80..d930485 100644 --- 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); -- 2.7.4