diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-05-15 13:24:15 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-05-15 13:24:15 +0800 |
| commit | d92240a7413c519e4b001eb54b667257a4f8c9ca (patch) | |
| tree | b69d700391948ec5af966b747039ab999784ab93 | |
| parent | 90ca5a465b4651e7656ba60307628679d43ef393 (diff) | |
| download | gsoc2013-evolution-d92240a7413c519e4b001eb54b667257a4f8c9ca.tar.gz gsoc2013-evolution-d92240a7413c519e4b001eb54b667257a4f8c9ca.tar.zst gsoc2013-evolution-d92240a7413c519e4b001eb54b667257a4f8c9ca.zip | |
Instead of g_assert()ing that the msg_info is not NULL, if it is NULL just
2002-05-15 Jeffrey Stedfast <fejj@ximian.com>
* 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
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/message-list.c | 3 |
2 files changed, 9 insertions, 1 deletions
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 <fejj@ximian.com> + + * 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 <fejj@ximian.com> * 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: { |