From: Tristan Chabredier <wwp@claws-mail.org>
Date: Tue, 21 Mar 2006 13:32:19 +0000 (+0000)
Subject: 2006-03-21 [wwp]	2.0.0cvs160
X-Git-Tag: REL_2_1_0~31
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=2c6bab555e4612b5e43756ed3a249a7f04d52b9a

2006-03-21 [wwp]	2.0.0cvs160

	* src/etpan/imap-thread.c
		fix for bug #925 (IMAP+SSL crash), thanks to Colin.
---

diff --git a/ChangeLog b/ChangeLog
index c95b0a2bc..ef3c116d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-21 [wwp]	2.0.0cvs160
+
+	* src/etpan/imap-thread.c
+		fix for bug #925 (IMAP+SSL crash), thanks to Colin.
+
 2006-03-20 [colin]	2.0.0cvs159
 
 	* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
index f07797d69..4179b4ea7 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1345,3 +1345,4 @@
 ( cvs diff -u -r 1.60.2.52 -r 1.60.2.53 src/addressbook.c;  ) > 2.0.0cvs157.patchset
 ( cvs diff -u -r 1.60.2.53 -r 1.60.2.54 src/addressbook.c;  ) > 2.0.0cvs158.patchset
 ( cvs diff -u -r 1.395.2.184 -r 1.395.2.185 src/summaryview.c;  ) > 2.0.0cvs159.patchset
+( cvs diff -u -r 1.1.4.31 -r 1.1.4.32 src/etpan/imap-thread.c;  ) > 2.0.0cvs160.patchset
diff --git a/configure.ac b/configure.ac
index 86b345336..68edc4097 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=159
+EXTRA_VERSION=160
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 61f02a763..2d99ca225 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -331,7 +331,7 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port)
 	chashdatum key;
 	chashdatum value;
 	mailimap * imap;
-	unsigned char *certificate;
+	unsigned char *certificate = NULL;
 	int cert_len;
 
 	imap = mailimap_new(0, NULL);