2012-12-05 [colin] 3.9.0cvs41

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

diff --git a/ChangeLog b/ChangeLog
index 037b5e23185c9f538351addac1e1d3f33517d634..597634e76f939285290a3a1423c3ad3080410f2e 100644 (file)
--- 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
index f00ae91089e4c57a189eae84bea0f9064109d273..6b77119b73b5f4e477a9b3430121b30f21815117 100644 (file)
--- 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
index 84af6e5f644ac25c656d7d9dae68b75e467ff62d..344844145cccca118b3ab01c207d5431f7233fe9 100644 (file)
--- 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
index a47ce3d49d6749ffc7d628c1a90e9c0b1cbee3e1..b7623de8fed647e13a2d250cb05767c65f482426 100644 (file)
--- 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;
        }
 }