From 0e338ba3e0fa03b28664448af0cea686c5e6c26d Mon Sep 17 00:00:00 2001 From: Mike Newman Date: Fri, 17 Jan 2003 07:46:11 +0000 Subject: Fix a segfault in the --list if no data is supplied to populate the tree. --- ChangeLog | 6 ++++++ src/tree.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0aee393..cc2a008 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-01-16 Mike Newman + + * src/tree.c: fix a segfault if a --list is constructed and there + is no data to put in it. Since a list with no contents to select + seemed pointless, return without showing dialog. + 2003-01-15 Glynn Foster * help/C/Makefile.am, help/C/legal.xml, help/C/zenity-C.omf, diff --git a/src/tree.c b/src/tree.c index 29b38c6..c19b180 100644 --- a/src/tree.c +++ b/src/tree.c @@ -124,7 +124,13 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) data->exit_code = -1; return; } - + + if (tree_data->data == NULL) { + g_printerr (_("No contents specified for --list\n")); + data->exit_code = -1; + return; + } + glade_xml_signal_autoconnect (glade_dialog); dialog = glade_xml_get_widget (glade_dialog, "zenity_tree_dialog"); -- cgit v1.2.3-2-g168b