Patch from Priit Laes <plaes@plaes.org>: Fix for bug #548059 (NULL check message...

svn path=/trunk/; revision=9364

diff --git a/camel/ChangeLog b/camel/ChangeLog
index c429931..98428e5 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-18  Priit Laes  <plaes@plaes.org>
+
+       ** Fix for bug #548059
+
+       * camel-folder-thread.c (thread_summary): NULL check message-id before 
+       accessing its elements. 
+
 2008-08-18  Sergio Villar Senín  <svillar@igalia.com>
 
        ** Fix for bug #546444

diff --git a/camel/camel-folder-thread.c b/camel/camel-folder-thread.c
index 08f680a..2a8fe98 100644 (file)
--- a/camel/camel-folder-thread.c
+++ b/camel/camel-folder-thread.c
@@ -452,7 +452,7 @@ thread_summary(CamelFolderThread *thread, GPtrArray *summary)
                const CamelSummaryMessageID *mid = camel_message_info_message_id(mi);
                const CamelSummaryReferences *references = camel_message_info_references(mi);
 
-               if (mid->id.id) {
+               if (mid != NULL && mid->id.id) {
                        c = g_hash_table_lookup(id_table, mid);
                        /* check for duplicate messages */
                        if (c && c->order) {