From a6039388a38f926ed62f6d3002a505d1fcb34098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Pettersen?= Date: Sun, 31 Oct 1999 18:00:58 +0000 Subject: [PATCH] test if node is NULL --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gcache.c | 2 ++ glib/gcache.c | 2 ++ 10 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index fa7a6017d..33f789496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +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 * 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 fa7a6017d..33f789496 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +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 * 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 fa7a6017d..33f789496 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +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 * 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 fa7a6017d..33f789496 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +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 * 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 fa7a6017d..33f789496 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +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 * 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 fa7a6017d..33f789496 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +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 * 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 fa7a6017d..33f789496 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +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 * 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 fa7a6017d..33f789496 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +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 * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around diff --git a/gcache.c b/gcache.c index 145a09316..bba791024 100644 --- a/gcache.c +++ b/gcache.c @@ -157,6 +157,8 @@ g_cache_remove (GCache *cache, key = g_hash_table_lookup (rcache->value_table, value); node = g_hash_table_lookup (rcache->key_table, key); + 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 145a09316..bba791024 100644 --- a/glib/gcache.c +++ b/glib/gcache.c @@ -157,6 +157,8 @@ g_cache_remove (GCache *cache, key = g_hash_table_lookup (rcache->value_table, value); node = g_hash_table_lookup (rcache->key_table, key); + g_return_if_fail (node != NULL); + node->ref_count -= 1; if (node->ref_count == 0) {