check for key_compare_func != NULL (reported by Michal Kara).

Fri Sep 18 03:41:20 1998  Tim Janik  <timj@gtk.org>

        * gtree.c (g_tree_new): check for key_compare_func != NULL (reported
        by Michal Kara).

diff --git a/ChangeLog b/ChangeLog
index a9e713e..191fea9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 18 03:41:20 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * config.h.in: removed from repository

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a9e713e..191fea9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Sep 18 03:41:20 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * config.h.in: removed from repository

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a9e713e..191fea9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Sep 18 03:41:20 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * config.h.in: removed from repository

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a9e713e..191fea9 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Fri Sep 18 03:41:20 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * config.h.in: removed from repository

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a9e713e..191fea9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Sep 18 03:41:20 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * config.h.in: removed from repository

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a9e713e..191fea9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Sep 18 03:41:20 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * config.h.in: removed from repository

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a9e713e..191fea9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Sep 18 03:41:20 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * config.h.in: removed from repository

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a9e713e..191fea9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Sep 18 03:41:20 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * config.h.in: removed from repository

diff --git a/glib/gtree.c b/glib/gtree.c
index 00bfb14..0d7f78c 100644 (file)
--- 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 00bfb14..0d7f78c 100644 (file)
--- 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;