From ac3a8ac9a7cd2d5f085d8c6964fd14ebe7e70d47 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 18 Sep 1998 02:12:32 +0000 Subject: [PATCH] check for key_compare_func != NULL (reported by Michal Kara). Fri Sep 18 03:41:20 1998 Tim Janik * gtree.c (g_tree_new): check for key_compare_func != NULL (reported by Michal Kara). --- 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 +++++ glib/gtree.c | 2 ++ gtree.c | 2 ++ 10 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index a9e713e3..191fea97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 18 03:41:20 1998 Tim Janik + + * gtree.c (g_tree_new): check for key_compare_func != NULL (reported + by Michal Kara). + Thu Sep 17 18:55:46 PDT 1998 Manish Singh * config.h.in: removed from repository diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a9e713e3..191fea97 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Fri Sep 18 03:41:20 1998 Tim Janik + + * gtree.c (g_tree_new): check for key_compare_func != NULL (reported + by Michal Kara). + Thu Sep 17 18:55:46 PDT 1998 Manish Singh * config.h.in: removed from repository diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a9e713e3..191fea97 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Sep 18 03:41:20 1998 Tim Janik + + * gtree.c (g_tree_new): check for key_compare_func != NULL (reported + by Michal Kara). + Thu Sep 17 18:55:46 PDT 1998 Manish Singh * config.h.in: removed from repository diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a9e713e3..191fea97 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Fri Sep 18 03:41:20 1998 Tim Janik + + * gtree.c (g_tree_new): check for key_compare_func != NULL (reported + by Michal Kara). + Thu Sep 17 18:55:46 PDT 1998 Manish Singh * config.h.in: removed from repository diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a9e713e3..191fea97 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Sep 18 03:41:20 1998 Tim Janik + + * gtree.c (g_tree_new): check for key_compare_func != NULL (reported + by Michal Kara). + Thu Sep 17 18:55:46 PDT 1998 Manish Singh * config.h.in: removed from repository diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a9e713e3..191fea97 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Sep 18 03:41:20 1998 Tim Janik + + * gtree.c (g_tree_new): check for key_compare_func != NULL (reported + by Michal Kara). + Thu Sep 17 18:55:46 PDT 1998 Manish Singh * config.h.in: removed from repository diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a9e713e3..191fea97 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Sep 18 03:41:20 1998 Tim Janik + + * gtree.c (g_tree_new): check for key_compare_func != NULL (reported + by Michal Kara). + Thu Sep 17 18:55:46 PDT 1998 Manish Singh * config.h.in: removed from repository diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a9e713e3..191fea97 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Sep 18 03:41:20 1998 Tim Janik + + * gtree.c (g_tree_new): check for key_compare_func != NULL (reported + by Michal Kara). + Thu Sep 17 18:55:46 PDT 1998 Manish Singh * config.h.in: removed from repository diff --git a/glib/gtree.c b/glib/gtree.c index 00bfb14c..0d7f78cf 100644 --- a/glib/gtree.c +++ b/glib/gtree.c @@ -87,6 +87,8 @@ g_tree_new (GCompareFunc key_compare_func) { GRealTree *rtree; + g_return_val_if_fail (key_compare_func != NULL, NULL); + rtree = g_new (GRealTree, 1); rtree->root = NULL; rtree->key_compare = key_compare_func; diff --git a/gtree.c b/gtree.c index 00bfb14c..0d7f78cf 100644 --- a/gtree.c +++ b/gtree.c @@ -87,6 +87,8 @@ g_tree_new (GCompareFunc key_compare_func) { GRealTree *rtree; + g_return_val_if_fail (key_compare_func != NULL, NULL); + rtree = g_new (GRealTree, 1); rtree->root = NULL; rtree->key_compare = key_compare_func; -- 2.34.1