talons

commit f851947030285dd8e3fcfb73725f2d2b1f51f76b
parent 6dea180b5c980a1dbdcc4e0b566bb8f372e42f0c
Author: Colin Leroy <colin@colino.net>
Date:   Wed,  5 Dec 2012 20:26:21 +0000

2012-12-05 [colin]	3.9.0cvs41

	* src/common/ssl.c
		Nullify xcred pointer like the other ones

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/ssl.c
 | 
4
+++-

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-05 [colin]	3.9.0cvs41
+
+	* src/common/ssl.c
+		Nullify xcred pointer like the other ones
+
 2012-12-03 [wwp]	3.9.0cvs40
 
 	* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4538,3 +4538,4 @@
 ( cvs diff -u -r 1.36.2.211 -r 1.36.2.212 src/common/utils.c;  ) > 3.9.0cvs38.patchset
 ( cvs diff -u -r 1.43.2.135 -r 1.43.2.136 src/toolbar.c;  ) > 3.9.0cvs39.patchset
 ( cvs diff -u -r 1.395.2.460 -r 1.395.2.461 src/summaryview.c;  cvs diff -u -r 1.274.2.362 -r 1.274.2.363 src/mainwindow.c;  ) > 3.9.0cvs40.patchset
+( cvs diff -u -r 1.9.2.59 -r 1.9.2.60 src/common/ssl.c;  ) > 3.9.0cvs41.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/ssl.c b/src/common/ssl.c
@@ -345,7 +345,8 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
 void ssl_done_socket(SockInfo *sockinfo)
 {
 	if (sockinfo && sockinfo->ssl) {
-		gnutls_certificate_free_credentials(sockinfo->xcred);
+		if (sockinfo->xcred)
+			gnutls_certificate_free_credentials(sockinfo->xcred);
 		gnutls_deinit(sockinfo->ssl);
 		if (sockinfo->client_crt)
 			gnutls_x509_crt_deinit(sockinfo->client_crt);
@@ -353,6 +354,7 @@ void ssl_done_socket(SockInfo *sockinfo)
 			gnutls_x509_privkey_deinit(sockinfo->client_key);
 		sockinfo->client_key = NULL;
 		sockinfo->client_crt = NULL;
+		sockinfo->xcred = NULL;
 		sockinfo->ssl = NULL;
 	}
 }