mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-06-20 11:14:50 +02:00
Use the fix for the g_cache_remove bug from the 1.2 branch instead.
This commit is contained in:
parent
30cc3ed1fe
commit
5bca288054
@ -1,8 +1,5 @@
|
|||||||
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gcache.c (g_cache_remove): Don't crash if removing a nonexistent
|
|
||||||
value.
|
|
||||||
|
|
||||||
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
||||||
a Unixish current locale string (en, zh_TW etc).
|
a Unixish current locale string (en, zh_TW etc).
|
||||||
|
|
||||||
@ -16,6 +13,11 @@
|
|||||||
make sure we don't call AllocConsole several times, which I think
|
make sure we don't call AllocConsole several times, which I think
|
||||||
has happened.
|
has happened.
|
||||||
|
|
||||||
|
Sun Oct 31 18:55:01 1999 ape@spacetec.no (Asbjorn Pettersen)
|
||||||
|
|
||||||
|
* gcache.c (g_cache_remove): Test if node is NULL.
|
||||||
|
If not tested, GIMP's script-fu will crash.
|
||||||
|
|
||||||
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gcache.c (g_cache_remove): Don't crash if removing a nonexistent
|
|
||||||
value.
|
|
||||||
|
|
||||||
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
||||||
a Unixish current locale string (en, zh_TW etc).
|
a Unixish current locale string (en, zh_TW etc).
|
||||||
|
|
||||||
@ -16,6 +13,11 @@
|
|||||||
make sure we don't call AllocConsole several times, which I think
|
make sure we don't call AllocConsole several times, which I think
|
||||||
has happened.
|
has happened.
|
||||||
|
|
||||||
|
Sun Oct 31 18:55:01 1999 ape@spacetec.no (Asbjorn Pettersen)
|
||||||
|
|
||||||
|
* gcache.c (g_cache_remove): Test if node is NULL.
|
||||||
|
If not tested, GIMP's script-fu will crash.
|
||||||
|
|
||||||
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gcache.c (g_cache_remove): Don't crash if removing a nonexistent
|
|
||||||
value.
|
|
||||||
|
|
||||||
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
||||||
a Unixish current locale string (en, zh_TW etc).
|
a Unixish current locale string (en, zh_TW etc).
|
||||||
|
|
||||||
@ -16,6 +13,11 @@
|
|||||||
make sure we don't call AllocConsole several times, which I think
|
make sure we don't call AllocConsole several times, which I think
|
||||||
has happened.
|
has happened.
|
||||||
|
|
||||||
|
Sun Oct 31 18:55:01 1999 ape@spacetec.no (Asbjorn Pettersen)
|
||||||
|
|
||||||
|
* gcache.c (g_cache_remove): Test if node is NULL.
|
||||||
|
If not tested, GIMP's script-fu will crash.
|
||||||
|
|
||||||
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gcache.c (g_cache_remove): Don't crash if removing a nonexistent
|
|
||||||
value.
|
|
||||||
|
|
||||||
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
||||||
a Unixish current locale string (en, zh_TW etc).
|
a Unixish current locale string (en, zh_TW etc).
|
||||||
|
|
||||||
@ -16,6 +13,11 @@
|
|||||||
make sure we don't call AllocConsole several times, which I think
|
make sure we don't call AllocConsole several times, which I think
|
||||||
has happened.
|
has happened.
|
||||||
|
|
||||||
|
Sun Oct 31 18:55:01 1999 ape@spacetec.no (Asbjorn Pettersen)
|
||||||
|
|
||||||
|
* gcache.c (g_cache_remove): Test if node is NULL.
|
||||||
|
If not tested, GIMP's script-fu will crash.
|
||||||
|
|
||||||
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gcache.c (g_cache_remove): Don't crash if removing a nonexistent
|
|
||||||
value.
|
|
||||||
|
|
||||||
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
||||||
a Unixish current locale string (en, zh_TW etc).
|
a Unixish current locale string (en, zh_TW etc).
|
||||||
|
|
||||||
@ -16,6 +13,11 @@
|
|||||||
make sure we don't call AllocConsole several times, which I think
|
make sure we don't call AllocConsole several times, which I think
|
||||||
has happened.
|
has happened.
|
||||||
|
|
||||||
|
Sun Oct 31 18:55:01 1999 ape@spacetec.no (Asbjorn Pettersen)
|
||||||
|
|
||||||
|
* gcache.c (g_cache_remove): Test if node is NULL.
|
||||||
|
If not tested, GIMP's script-fu will crash.
|
||||||
|
|
||||||
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gcache.c (g_cache_remove): Don't crash if removing a nonexistent
|
|
||||||
value.
|
|
||||||
|
|
||||||
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
||||||
a Unixish current locale string (en, zh_TW etc).
|
a Unixish current locale string (en, zh_TW etc).
|
||||||
|
|
||||||
@ -16,6 +13,11 @@
|
|||||||
make sure we don't call AllocConsole several times, which I think
|
make sure we don't call AllocConsole several times, which I think
|
||||||
has happened.
|
has happened.
|
||||||
|
|
||||||
|
Sun Oct 31 18:55:01 1999 ape@spacetec.no (Asbjorn Pettersen)
|
||||||
|
|
||||||
|
* gcache.c (g_cache_remove): Test if node is NULL.
|
||||||
|
If not tested, GIMP's script-fu will crash.
|
||||||
|
|
||||||
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gcache.c (g_cache_remove): Don't crash if removing a nonexistent
|
|
||||||
value.
|
|
||||||
|
|
||||||
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
||||||
a Unixish current locale string (en, zh_TW etc).
|
a Unixish current locale string (en, zh_TW etc).
|
||||||
|
|
||||||
@ -16,6 +13,11 @@
|
|||||||
make sure we don't call AllocConsole several times, which I think
|
make sure we don't call AllocConsole several times, which I think
|
||||||
has happened.
|
has happened.
|
||||||
|
|
||||||
|
Sun Oct 31 18:55:01 1999 ape@spacetec.no (Asbjorn Pettersen)
|
||||||
|
|
||||||
|
* gcache.c (g_cache_remove): Test if node is NULL.
|
||||||
|
If not tested, GIMP's script-fu will crash.
|
||||||
|
|
||||||
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
1999-10-31 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gcache.c (g_cache_remove): Don't crash if removing a nonexistent
|
|
||||||
value.
|
|
||||||
|
|
||||||
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
* gutils.c (gwin_getlocale): New Win32-specific function, returns
|
||||||
a Unixish current locale string (en, zh_TW etc).
|
a Unixish current locale string (en, zh_TW etc).
|
||||||
|
|
||||||
@ -16,6 +13,11 @@
|
|||||||
make sure we don't call AllocConsole several times, which I think
|
make sure we don't call AllocConsole several times, which I think
|
||||||
has happened.
|
has happened.
|
||||||
|
|
||||||
|
Sun Oct 31 18:55:01 1999 ape@spacetec.no (Asbjorn Pettersen)
|
||||||
|
|
||||||
|
* gcache.c (g_cache_remove): Test if node is NULL.
|
||||||
|
If not tested, GIMP's script-fu will crash.
|
||||||
|
|
||||||
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
Sun Oct 17 18:11:40 1999 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around
|
||||||
|
3
gcache.c
3
gcache.c
@ -157,8 +157,7 @@ g_cache_remove (GCache *cache,
|
|||||||
key = g_hash_table_lookup (rcache->value_table, value);
|
key = g_hash_table_lookup (rcache->value_table, value);
|
||||||
node = g_hash_table_lookup (rcache->key_table, key);
|
node = g_hash_table_lookup (rcache->key_table, key);
|
||||||
|
|
||||||
if (node == NULL)
|
g_return_if_fail (node != NULL);
|
||||||
return;
|
|
||||||
|
|
||||||
node->ref_count -= 1;
|
node->ref_count -= 1;
|
||||||
if (node->ref_count == 0)
|
if (node->ref_count == 0)
|
||||||
|
@ -157,8 +157,7 @@ g_cache_remove (GCache *cache,
|
|||||||
key = g_hash_table_lookup (rcache->value_table, value);
|
key = g_hash_table_lookup (rcache->value_table, value);
|
||||||
node = g_hash_table_lookup (rcache->key_table, key);
|
node = g_hash_table_lookup (rcache->key_table, key);
|
||||||
|
|
||||||
if (node == NULL)
|
g_return_if_fail (node != NULL);
|
||||||
return;
|
|
||||||
|
|
||||||
node->ref_count -= 1;
|
node->ref_count -= 1;
|
||||||
if (node->ref_count == 0)
|
if (node->ref_count == 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user