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

10 files changed, 42 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 78efcdf56..68ff3a79e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 78efcdf56..68ff3a79e 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 78efcdf56..68ff3a79e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 78efcdf56..68ff3a79e 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 78efcdf56..68ff3a79e 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 78efcdf56..68ff3a79e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 78efcdf56..68ff3a79e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 78efcdf56..68ff3a79e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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
diff --git a/gcache.c b/gcache.c
index dc58f0775..bba791024 100644
--- a/gcache.c
+++ b/gcache.c
@@ -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)
diff --git a/glib/gcache.c b/glib/gcache.c
index dc58f0775..bba791024 100644
--- a/glib/gcache.c
+++ b/glib/gcache.c
@@ -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)