From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 14 Sep 2012 20:37:58 +0000 (-0600)
Subject: Do not dereference nil Ssl::CertValidationHelper::GetInstance().
X-Git-Tag: SQUID_3_4_0_1~458^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f54e3d4cd396ca514565c30d36ea13b9f5574c19;p=thirdparty%2Fsquid.git

Do not dereference nil Ssl::CertValidationHelper::GetInstance().
---

diff --git a/src/main.cc b/src/main.cc
index 1ca8b10025..2b6b8c83f7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -758,7 +758,8 @@ mainReconfigureStart(void)
     Ssl::Helper::GetInstance()->Shutdown();
 #endif
 #if USE_SSL
-    Ssl::CertValidationHelper::GetInstance()->Shutdown();
+    if (Ssl::CertValidationHelper::GetInstance())
+        Ssl::CertValidationHelper::GetInstance()->Shutdown();
     Ssl::TheGlobalContextStorage.reconfigureStart();
 #endif
     redirectShutdown();
@@ -1858,7 +1859,8 @@ SquidShutdown()
     Ssl::Helper::GetInstance()->Shutdown();
 #endif
 #if USE_SSL
-    Ssl::CertValidationHelper::GetInstance()->Shutdown();
+    if (Ssl::CertValidationHelper::GetInstance())
+        Ssl::CertValidationHelper::GetInstance()->Shutdown();
 #endif
     redirectShutdown();
     externalAclShutdown();