[pan2] fix segfault with gnutls
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] fix segfault with gnutls
- Date: Tue, 3 Apr 2012 18:09:59 +0000 (UTC)
commit 074e20fabcf98637fb62a3fb7a5422e0be706d6a
Author: Heinrich MÃller <henmull src gnome org>
Date: Tue Apr 3 20:09:36 2012 +0200
fix segfault with gnutls
pan/data/cert-store.cc | 5 +++--
pan/gui/body-pane.cc | 3 ---
2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc
index 4cc3d47..9cd07ee 100644
--- a/pan/data/cert-store.cc
+++ b/pan/data/cert-store.cc
@@ -139,8 +139,9 @@ namespace pan
if (!gnutls_x509_crt_check_hostname (cert, mydata->hostname_full.c_str()))
{
- g_error ("The certificate's owner does not match hostname '%s' !\n", mydata->hostname_full.c_str());
- goto _fail;
+ if (!mydata->always_trust)
+ g_warning ("The certificate's owner does not match hostname '%s' !\n", mydata->hostname_full.c_str());
+ goto _fail;
}
if (fail) goto _fail;
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 9a37b97..8ba8187 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -1778,9 +1778,6 @@ BodyPane :: BodyPane (Data& data, ArticleCache& cache, Prefs& prefs, GroupPrefs
BodyPane :: ~BodyPane ()
{
-
- std::cerr<<"dtor bodypane"<<std::endl;
-
_prefs.remove_listener (this);
g_object_unref (_verbose);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]