From 6dea851f5e55200aa2f7cc7250c04371a3534c86 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 23 Aug 2009 12:16:17 +0000 Subject: [PATCH] 2009-08-23 [colin] 3.7.2cvs26 * src/mbox.c Probably fix RH bug 512024, " folder.c:3543 Condition msglist != NULL failed" --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/mbox.c | 10 ++++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27a7fb236..f5f05b180 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-08-23 [colin] 3.7.2cvs26 + + * src/mbox.c + Probably fix RH bug 512024, " folder.c:3543 + Condition msglist != NULL failed" + 2009-08-23 [colin] 3.7.2cvs25 * src/prefs_compose_writing.c diff --git a/PATCHSETS b/PATCHSETS index 014850af5..f17e29507 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3850,3 +3850,4 @@ ( cvs diff -u -r 1.382.2.521 -r 1.382.2.522 src/compose.c; ) > 3.7.2cvs23.patchset ( cvs diff -u -r 1.382.2.522 -r 1.382.2.523 src/compose.c; ) > 3.7.2cvs24.patchset ( cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/prefs_compose_writing.c; ) > 3.7.2cvs25.patchset +( cvs diff -u -r 1.28.2.48 -r 1.28.2.49 src/mbox.c; ) > 3.7.2cvs26.patchset diff --git a/configure.ac b/configure.ac index bd17c87b1..50d187cf7 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=25 +EXTRA_VERSION=26 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mbox.c b/src/mbox.c index df326568e..339a0d478 100644 --- a/src/mbox.c +++ b/src/mbox.c @@ -279,10 +279,12 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter, } unfiltered = g_slist_reverse(unfiltered); - folder_item_move_msgs(dest, unfiltered); - for (cur = unfiltered; cur; cur = g_slist_next(cur)) { - MsgInfo *info = (MsgInfo *)cur->data; - procmsg_msginfo_free(info); + if (unfiltered) { + folder_item_move_msgs(dest, unfiltered); + for (cur = unfiltered; cur; cur = g_slist_next(cur)) { + MsgInfo *info = (MsgInfo *)cur->data; + procmsg_msginfo_free(info); + } } g_slist_free(unfiltered); -- 2.25.1