From: Colin Leroy <colin@colino.net>
Date: Wed, 11 Jun 2008 05:48:59 +0000 (+0000)
Subject: 2008-06-11 [colin]	3.4.0cvs90
X-Git-Tag: rel_3_5_0~28
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=0a6639a1cc748d8990056e9df9f2c0cfce027c69

2008-06-11 [colin]	3.4.0cvs90

	* src/folder.c
		Maybe fix bug 1623, 'exits with segfault when
		logging in to certain imap-servers'
---

diff --git a/ChangeLog b/ChangeLog
index c2ada8673..ce67b7920 100644
--- 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
diff --git a/PATCHSETS b/PATCHSETS
index 772e6c7c0..009a0d7df 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3385,3 +3385,4 @@
 ( 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
diff --git a/configure.ac b/configure.ac
index 9ec0fcb18..00b01b355 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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=
 
diff --git a/src/folder.c b/src/folder.c
index 94275ef99..bd6e03554 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -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;