2010-05-14 [colin] 3.7.6cvs5
authorColin Leroy <colin@colino.net>
Fri, 14 May 2010 09:54:46 +0000 (09:54 +0000)
committerColin Leroy <colin@colino.net>
Fri, 14 May 2010 09:54:46 +0000 (09:54 +0000)
* src/gtk/sslcertwindow.c
Fix dangling pointer. Thanks to Michael R!

ChangeLog
PATCHSETS
configure.ac
src/gtk/sslcertwindow.c

index ac0f87a..9167622 100644 (file)
--- 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
index bbef5d1..fc9ad33 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 27a763d..9a18543 100644 (file)
@@ -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=
 
index e3eb94f..171b51c 100644 (file)
@@ -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);