From 962b8d22dd6fe56ea6b779b4e2d22f89b623752a Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 14 Jul 2009 15:37:14 +0000 Subject: [PATCH] 2009-07-14 [colin] 3.7.2cvs8 * src/imap.c Fix bug 1954, 'Segfault on reading wrong STATUS' --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/imap.c | 9 ++++++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f74843f67..c25554bf0 100644 --- 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 index a892e3945..f7c23ec40 100644 --- 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 index c29a473a9..a5c9b6e46 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=7 +EXTRA_VERSION=8 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/imap.c b/src/imap.c index 712d0fdb1..9b9055733 100644 --- 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; } -- 2.25.1