2008-06-11 [colin] 3.4.0cvs90
authorColin Leroy <colin@colino.net>
Wed, 11 Jun 2008 05:48:59 +0000 (05:48 +0000)
committerColin Leroy <colin@colino.net>
Wed, 11 Jun 2008 05:48:59 +0000 (05:48 +0000)
* src/folder.c
Maybe fix bug 1623, 'exits with segfault when
logging in to certain imap-servers'

ChangeLog
PATCHSETS
configure.ac
src/folder.c

index c2ada86..ce67b79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-11 [colin]     3.4.0cvs90
+
+       * src/folder.c
+               Maybe fix bug 1623, 'exits with segfault when 
+               logging in to certain imap-servers'
+
 2008-06-10 [mones]     3.4.0cvs89
 
        * AUTHORS
index 772e6c7..009a0d7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.25.2.25 -r 1.25.2.26 tools/Makefile.am;  ) > 3.4.0cvs87.patchset
 ( cvs diff -u -r 1.42.2.38 -r 1.42.2.39 po/fr.po;  ) > 3.4.0cvs88.patchset
 ( cvs diff -u -r 1.100.2.61 -r 1.100.2.62 AUTHORS;  cvs diff -u -r 1.25.2.26 -r 1.25.2.27 tools/Makefile.am;  cvs diff -u -r 1.30.2.30 -r 1.30.2.31 tools/README;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 tools/convert_mbox.sh;  ) > 3.4.0cvs89.patchset
+( cvs diff -u -r 1.213.2.183 -r 1.213.2.184 src/folder.c;  ) > 3.4.0cvs90.patchset
index 9ec0fcb..00b01b3 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=89
+EXTRA_VERSION=90
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 94275ef..bd6e035 100644 (file)
@@ -2117,7 +2117,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        }
 
                        /* Move to next folder number */
-                       folder_list_cur = folder_list_cur->next;
+                       if (folder_list_cur)
+                               folder_list_cur = folder_list_cur->next;
 
                        if (folder_list_cur != NULL)
                                folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
@@ -2136,7 +2137,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        debug_print("Removed message %d from cache.\n", cache_cur_num);
 
                        /* Move to next cache number */
-                       cache_list_cur = cache_list_cur->next;
+                       if (cache_list_cur)
+                               cache_list_cur = cache_list_cur->next;
 
                        if (cache_list_cur != NULL)
                                cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
@@ -2173,8 +2175,11 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        }
                        
                        /* Move to next folder and cache number */
-                       cache_list_cur = cache_list_cur->next;
-                       folder_list_cur = folder_list_cur->next;
+                       if (cache_list_cur)
+                               cache_list_cur = cache_list_cur->next;
+                       
+                       if (folder_list_cur)
+                               folder_list_cur = folder_list_cur->next;
 
                        if (cache_list_cur != NULL)
                                cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;