2007-09-28 [colin] 3.0.1cvs38

	* src/folder.c
		Fix bug 1337, 'crash on pressing Send button'

diff --git a/ChangeLog b/ChangeLog
index 8b9ef8ebfbc9633c0a9b4abeeb045ca8a3932db9..d2f3453e86622506b531ab68d33d1969fb3cd1c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-28 [colin]     3.0.1cvs38
+
+       * src/folder.c
+               Fix bug 1337, 'crash on pressing Send button'
+
 2007-09-28 [paul]      3.0.1cvs37
 
        * src/prefs_folder_item.c

diff --git a/PATCHSETS b/PATCHSETS
index 34072791d6a1c1c731611b8f7f5306f8066814dc..e0f3e6665dcc0284be2878e895752590e8e194e3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2901,3 +2901,4 @@
 ( cvs diff -u -r 1.1.2.77 -r 1.1.2.78 src/gtk/quicksearch.c;  ) > 3.0.1cvs35.patchset
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/prefs_folder_column.c;  cvs diff -u -r 1.10.2.20 -r 1.10.2.21 src/prefs_summary_column.c;  ) > 3.0.1cvs36.patchset
 ( cvs diff -u -r 1.52.2.51 -r 1.52.2.52 src/prefs_folder_item.c;  ) > 3.0.1cvs37.patchset
+( cvs diff -u -r 1.213.2.163 -r 1.213.2.164 src/folder.c;  ) > 3.0.1cvs38.patchset

diff --git a/configure.ac b/configure.ac
index 189d9c28142c883c0990b129c67508107e1d33fa..3e779c0ad060565c857da3ed092b6d821c68e4c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index c62f49d02ba466d4a79c09ce1156f8e070dc1537..38ed4ed4f66bddb4890f94e2a67a84f71abfbfb9 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -3479,7 +3479,7 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
        if (!item->cache) folder_item_read_cache(item);
 
        msginfo = msgcache_get_msg(item->cache, num);
-       if (MSG_IS_LOCKED(msginfo->flags)) {
+       if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
                procmsg_msginfo_free(msginfo);
                return -1;
        }
@@ -3515,7 +3515,7 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
        }
        while (ret == 0 && msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;
-               if (MSG_IS_LOCKED(msginfo->flags)) {
+               if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
                        msglist = msglist->next;
                        continue;
                }