talons

commit 962b8d22dd6fe56ea6b779b4e2d22f89b623752a
parent 8a4a0c1bdb6170b47e3cead1042ec9945d1e80a6
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 14 Jul 2009 15:37:14 +0000

2009-07-14 [colin]	3.7.2cvs8

	* src/imap.c
		Fix bug 1954, 'Segfault on reading wrong STATUS'

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/imap.c
 | 
9
++++++---

4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-14 [colin]	3.7.2cvs8
+
+	* src/imap.c
+		Fix bug 1954, 'Segfault on reading wrong STATUS'
+
 2009-07-10 [colin]	3.7.2cvs7
 
 	* src/plugins/pgpcore/plugin.def
diff --git a/PATCHSETS b/PATCHSETS
@@ -3832,3 +3832,4 @@
 ( cvs diff -u -r 1.207.2.213 -r 1.207.2.214 src/folderview.c;  ) > 3.7.2cvs5.patchset
 ( cvs diff -u -r 1.16.2.36 -r 1.16.2.37 src/prefs_display_header.c;  ) > 3.7.2cvs6.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/plugin.def;  cvs diff -u -r 1.20.2.71 -r 1.20.2.72 src/common/utils.h;  ) > 3.7.2cvs7.patchset
+( cvs diff -u -r 1.179.2.247 -r 1.179.2.248 src/imap.c;  ) > 3.7.2cvs8.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap.c b/src/imap.c
@@ -3461,9 +3461,12 @@ static gint imap_status(IMAPSession *session, IMAPFolder *folder,
 		return r;
 	}
 	
-	if (data_status->st_info_list == NULL) {
-		mailimap_mailbox_data_status_free(data_status);
-		debug_print("status->st_info_list == NULL\n");
+	if (data_status == NULL || data_status->st_info_list == NULL) {
+		debug_print("data_status %p\n", data_status);
+		if (data_status) {
+			debug_print("data_status->st_info_list %p\n", data_status->st_info_list);
+			mailimap_mailbox_data_status_free(data_status);
+		}
 		return MAILIMAP_ERROR_BAD_STATE;
 	}