From cc1ad36f9904ef2c4f0615810564607d7ddcc842 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 10 Jun 2008 17:03:15 +0000 Subject: [PATCH] =?utf8?q?=20=20=20=20=20=20=20=20Bug=20536158=20=E2=80=93?= =?utf8?q?=20also=20bump=20GHashTable=20version=20when=20a=20node=20is=20r?= =?utf8?q?emoved=20via=20=20=20=20=20=20=20=20=20g=5Fhash=5Ftable=5Fiter?= =?utf8?q?=5Fremove()/g=5Fhash=5Ftable=5Fiter=5Fsteal()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * glib/ghash.c (iter_remove_or_steal): Bump the hash table version. Patch by Jean-Yves Lefort svn path=/trunk/; revision=6993 --- ChangeLog | 8 ++++++++ glib/ghash.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5c73df3d..eb50688f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-10 Matthias Clasen + + Bug 536158 – also bump GHashTable version when a node is removed via + g_hash_table_iter_remove()/g_hash_table_iter_steal() + + * glib/ghash.c (iter_remove_or_steal): Bump the hash table + version. Patch by Jean-Yves Lefort + 2008-06-07 Tor Lillqvist * glib/gstdio.c (g_access): Define X_OK if necessary (MSVC). diff --git a/glib/ghash.c b/glib/ghash.c index af81f5ac..e00b4c4c 100644 --- a/glib/ghash.c +++ b/glib/ghash.c @@ -530,6 +530,11 @@ iter_remove_or_steal (RealIter *ri, gboolean notify) g_slice_free (GHashNode, node); ri->hash_table->nnodes--; + +#ifndef G_DISABLE_ASSERT + ri->version++; + ri->hash_table->version++; +#endif } /** -- 2.34.1