im.pidgin.pidgin: 808f3abd595b5455181e500561e004cf2656f892

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 808f3abd595b5455181e500561e004cf2656f892
Ancestor: 525a410c03e7e16535f3fe683f9651283109265d
Author: datallah at pidgin.im
Date: 2007-10-09T20:12:48
Branch: im.pidgin.pidgin

Modified files:
        libpurple/plugins/ssl/ssl-gnutls.c

ChangeLog: 

Fix CID 318

-------------- next part --------------
============================================================
--- libpurple/plugins/ssl/ssl-gnutls.c	0c07158072e7eccbb72182ff5c11fbbf364fcaf4
+++ libpurple/plugins/ssl/ssl-gnutls.c	57f7fcd10b49eb8df0ba340ebc862041ca9b9d85
@@ -884,8 +884,8 @@ x509_times (PurpleCertificate *crt, time
 	gnutls_x509_crt crt_dat;
 	/* GnuTLS time functions return this on error */
 	const time_t errval = (time_t) (-1);
+	gboolean success = TRUE;
 
-
 	g_return_val_if_fail(crt, FALSE);
 	g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE);
 
@@ -893,16 +893,16 @@ x509_times (PurpleCertificate *crt, time
 
 	if (activation) {
 		*activation = gnutls_x509_crt_get_activation_time(crt_dat);
+		if (*activation == errval)
+			success = FALSE;
 	}
 	if (expiration) {
 		*expiration = gnutls_x509_crt_get_expiration_time(crt_dat);
+		if (*expiration == errval)
+			success = FALSE;
 	}
 
-	if (*activation == errval || *expiration == errval) {
-		return FALSE;
-	}
-
-	return TRUE;
+	return success;
 }
 
 /* X.509 certificate operations provided by this plugin */