Use the fix for the g_cache_remove bug from the 1.2 branch instead.

This commit is contained in:
Tor Lillqvist 1999-10-31 23:03:45 +00:00
parent 30cc3ed1fe
commit 5bca288054
10 changed files with 42 additions and 28 deletions

View File

@ -1,8 +1,5 @@
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
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
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>
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around

View File

@ -1,8 +1,5 @@
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
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
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>
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around

View File

@ -1,8 +1,5 @@
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
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
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>
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around

View File

@ -1,8 +1,5 @@
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
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
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>
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around

View File

@ -1,8 +1,5 @@
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
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
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>
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around

View File

@ -1,8 +1,5 @@
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
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
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>
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around

View File

@ -1,8 +1,5 @@
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
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
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>
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around

View File

@ -1,8 +1,5 @@
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
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
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>
* gdataset.c (g_data_set_internal): remove g_dataset_global_lock around

View File

@ -157,8 +157,7 @@ g_cache_remove (GCache *cache,
key = g_hash_table_lookup (rcache->value_table, value);
node = g_hash_table_lookup (rcache->key_table, key);
if (node == NULL)
return;
g_return_if_fail (node != NULL);
node->ref_count -= 1;
if (node->ref_count == 0)

View File

@ -157,8 +157,7 @@ g_cache_remove (GCache *cache,
key = g_hash_table_lookup (rcache->value_table, value);
node = g_hash_table_lookup (rcache->key_table, key);
if (node == NULL)
return;
g_return_if_fail (node != NULL);
node->ref_count -= 1;
if (node->ref_count == 0)