luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 16:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

ghash: Be more explicit about memory in g_hash_table_destroy_all_nodes()

Browse Source 
Make it clear that there is a reference transfer going on here, rather
than relying on the fields being overwritten on each branch of the
conditional below.
This commit is contained in:
Allison Karlitskaya 2019-05-20 16:39:35 +02:00
parent b3fbf6c18b
commit 9add93e5a4
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glib/ghash.c
View File

@ -637,9 +637,9 @@ g_hash_table_remove_all_nodes (GHashTable *hash_table,
* freeing them below. * freeing them below.
*/ */
old_size = hash_table->size; old_size = hash_table->size;
old_keys = hash_table->keys; old_keys = g_steal_pointer (&hash_table->keys);
old_values = hash_table->values; old_values = g_steal_pointer (&hash_table->values);
old_hashes = hash_table->hashes; old_hashes = g_steal_pointer (&hash_table->hashes);
if (!destruction) if (!destruction)
/* Any accesses will see an empty table */ /* Any accesses will see an empty table */
@ -651,12 +651,7 @@ g_hash_table_remove_all_nodes (GHashTable *hash_table,
} }
else else
/* Will cause a quick crash on any attempted access */ /* Will cause a quick crash on any attempted access */
{ hash_table->size = hash_table->mod = hash_table->mask = 0;
hash_table->size = hash_table->mod = hash_table->mask = 0;
hash_table->keys = NULL;
hash_table->values = NULL;
hash_table->hashes = NULL;
}
/* Now do the actual destroy notifies */ /* Now do the actual destroy notifies */
for (i = 0; i < old_size; i++) for (i = 0; i < old_size; i++)