talons

commit e302414124d275c1f5ada66ce63da2da5aa7eec2
parent 974a0c5eef44954748e3347a671416d33e47f512
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 14 May 2010 09:54:46 +0000

2010-05-14 [colin]	3.7.6cvs5

	* src/gtk/sslcertwindow.c
		Fix dangling pointer. Thanks to Michael R!

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/sslcertwindow.c
 | 
7
++++---

4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-14 [colin]	3.7.6cvs5
+
+	* src/gtk/sslcertwindow.c
+		Fix dangling pointer. Thanks to Michael R!
+
 2010-05-14 [colin]	3.7.6cvs4
 
 	* src/gtk/sslcertwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4000,3 +4000,4 @@
 ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_message.c;  ) > 3.7.6cvs2.patchset
 ( cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/plugins/pgpinline/pgpinline.c;  ) > 3.7.6cvs3.patchset
 ( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/gtk/sslcertwindow.c;  ) > 3.7.6cvs4.patchset
+( cvs diff -u -r 1.9.2.30 -r 1.9.2.31 src/gtk/sslcertwindow.c;  ) > 3.7.6cvs5.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
@@ -267,14 +267,15 @@ static gboolean sslcert_ask_hook(gpointer source, gpointer data)
 {
 	SSLCertHookData *hookdata = (SSLCertHookData *)source;
 
+	if (hookdata == NULL) {
+		return FALSE;
+	}
+	
 	if (prefs_common.skip_ssl_cert_check) {
 		hookdata->accept = TRUE;
 		return TRUE;
 	}
 
-	if (hookdata == NULL) {
-		return FALSE;
-	}
 	if (hookdata->old_cert == NULL) {
 		if (hookdata->expired)
 			hookdata->accept = sslcertwindow_ask_expired_cert(hookdata->cert);