From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 14 May 2015 21:47:16 +0000 (-0700)
Subject: Fix several uninitizliaed members variables
X-Git-Tag: merge-candidate-3-v1~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37611b26fc6163a4fd43ad390d86fae38804f102;p=thirdparty%2Fsquid.git

Fix several uninitizliaed members variables

 Detected by Coverity Scan. Issues 1297154 and 1297152.
---

diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc
index 8bcb2dd40a..e7b95620cc 100644
--- a/src/adaptation/icap/ServiceRep.cc
+++ b/src/adaptation/icap/ServiceRep.cc
@@ -33,6 +33,9 @@ CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, ServiceRep);
 
 Adaptation::Icap::ServiceRep::ServiceRep(const ServiceConfigPointer &svcCfg):
     AsyncJob("Adaptation::Icap::ServiceRep"), Adaptation::Service(svcCfg),
+#if USE_OPENSSL
+    sslSession(NULL),
+#endif
     theOptions(NULL), theOptionsFetcher(0), theLastUpdate(0),
     theBusyConns(0),
     theAllWaiters(0),
diff --git a/src/ssl/PeerConnector.cc b/src/ssl/PeerConnector.cc
index 64ef12335b..aa2cf968a3 100644
--- a/src/ssl/PeerConnector.cc
+++ b/src/ssl/PeerConnector.cc
@@ -34,11 +34,9 @@ CBDATA_NAMESPACED_CLASS_INIT(Ssl, PeerConnector);
 CBDATA_NAMESPACED_CLASS_INIT(Ssl, BlindPeerConnector);
 CBDATA_NAMESPACED_CLASS_INIT(Ssl, PeekingPeerConnector);
 
-Ssl::PeerConnector::PeerConnector(
-    const Comm::ConnectionPointer &aServerConn,
-    AsyncCall::Pointer &aCallback,
-    const time_t timeout):
+Ssl::PeerConnector::PeerConnector(const Comm::ConnectionPointer &aServerConn, AsyncCall::Pointer &aCallback, const time_t timeout) :
     AsyncJob("Ssl::PeerConnector"),
+    certErrors(NULL),
     serverConn(aServerConn),
     callback(aCallback),
     negotiationTimeout(timeout),
diff --git a/src/ssl/PeerConnector.h b/src/ssl/PeerConnector.h
index 1dee04c6ca..a36e02da08 100644
--- a/src/ssl/PeerConnector.h
+++ b/src/ssl/PeerConnector.h
@@ -183,8 +183,12 @@ class BlindPeerConnector: public PeerConnector {
 public:
     BlindPeerConnector(HttpRequestPointer &aRequest,
                        const Comm::ConnectionPointer &aServerConn,
-                       AsyncCall::Pointer &aCallback, const time_t timeout = 0): AsyncJob("Ssl::BlindPeerConnector"),
-        PeerConnector(aServerConn, aCallback, timeout) { request = aRequest; }
+                       AsyncCall::Pointer &aCallback, const time_t timeout = 0) :
+        AsyncJob("Ssl::BlindPeerConnector"),
+        PeerConnector(aServerConn, aCallback, timeout)
+    {
+        request = aRequest;
+    }
 
     /* PeerConnector API */
 
@@ -207,8 +211,16 @@ public:
     PeekingPeerConnector(HttpRequestPointer &aRequest,
                          const Comm::ConnectionPointer &aServerConn,
                          const Comm::ConnectionPointer &aClientConn,
-                         AsyncCall::Pointer &aCallback, const time_t timeout = 0): AsyncJob("Ssl::PeekingPeerConnector"),
-        PeerConnector(aServerConn, aCallback, timeout), clientConn(aClientConn), splice(false), resumingSession(false), serverCertificateHandled(false) { request = aRequest; }
+                         AsyncCall::Pointer &aCallback, const time_t timeout = 0) :
+        AsyncJob("Ssl::PeekingPeerConnector"),
+        PeerConnector(aServerConn, aCallback, timeout),
+        clientConn(aClientConn),
+        splice(false),
+        resumingSession(false),
+        serverCertificateHandled(false)
+    {
+        request = aRequest;
+    }
 
     /* PeerConnector API */
     virtual SSL *initializeSsl();