From d92240a7413c519e4b001eb54b667257a4f8c9ca Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 15 May 2002 05:24:15 +0000 Subject: Instead of g_assert()ing that the msg_info is not NULL, if it is NULL just 2002-05-15 Jeffrey Stedfast * message-list.c (ml_tree_value_at): Instead of g_assert()ing that the msg_info is not NULL, if it is NULL just return NULL. This fixes a crash when ETree requests the value at a root node (I don't understand why it needs to do that??). svn path=/trunk/; revision=16796 --- mail/ChangeLog | 7 +++++++ mail/message-list.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index cbed52727d..b8b5c98d3d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2002-05-15 Jeffrey Stedfast + + * message-list.c (ml_tree_value_at): Instead of g_assert()ing that + the msg_info is not NULL, if it is NULL just return NULL. This + fixes a crash when ETree requests the value at a root node (I + don't understand why it needs to do that??). + 2002-05-14 Jeffrey Stedfast * folder-info.h: Added. diff --git a/mail/message-list.c b/mail/message-list.c index 79f24f14a8..480e9ceb89 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -819,7 +819,8 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) /* retrieve the message information array */ msg_info = e_tree_memory_node_get_data (E_TREE_MEMORY(etm), path); - g_assert(msg_info); + if (!msg_info) + return NULL; switch (col){ case COL_MESSAGE_STATUS: { -- cgit v1.2.3