From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 3 Feb 2013 10:45:53 +0000 (-0700)
Subject: Fix several uninitialized object members in unit tests
X-Git-Tag: SQUID_3_4_0_1~319
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=814f9a2eab3f8f5c78c7ea654700cd7dc1bc5046;p=thirdparty%2Fsquid.git

Fix several uninitialized object members in unit tests

 Detected by Coverity Scan. Issues 740581, 740582, 740583, 740584
---

diff --git a/src/ssl/Config.cc b/src/ssl/Config.cc
index 7c2ef06717..0060df8ab4 100644
--- a/src/ssl/Config.cc
+++ b/src/ssl/Config.cc
@@ -3,14 +3,6 @@
 
 Ssl::Config Ssl::TheConfig;
 
-Ssl::Config::Config():
-#if USE_SSL_CRTD
-        ssl_crtd(NULL),
-#endif
-        ssl_crt_validator(NULL)
-{
-}
-
 Ssl::Config::~Config()
 {
 #if USE_SSL_CRTD
diff --git a/src/ssl/Config.h b/src/ssl/Config.h
index 6fa5daedd5..24de8f64f9 100644
--- a/src/ssl/Config.h
+++ b/src/ssl/Config.h
@@ -16,7 +16,12 @@ public:
 #endif
     char *ssl_crt_validator;
     HelperChildConfig ssl_crt_validator_Children;
-    Config();
+    Config():
+#if USE_SSL_CRTD
+            ssl_crtd(NULL),
+#endif
+            ssl_crt_validator(NULL) {}
+
     ~Config();
 private:
     Config(const Config &); // not implemented
diff --git a/src/tests/stub_DelayId.cc b/src/tests/stub_DelayId.cc
index 619ff73ef9..2f81b069a5 100644
--- a/src/tests/stub_DelayId.cc
+++ b/src/tests/stub_DelayId.cc
@@ -38,7 +38,7 @@
 #define STUB_API "stub_DelayId.cc"
 #include "tests/STUB.h"
 
-DelayId::DelayId() {}
+DelayId::DelayId(): pool_(0), compositeId(NULL), markedAsNoDelay(false) {}
 DelayId::~DelayId() {}
 
 void DelayId::delayRead(DeferredRead const&) STUB_NOP
diff --git a/src/tests/stub_HttpReply.cc b/src/tests/stub_HttpReply.cc
index c6a12b21bc..b7f5aef9c2 100644
--- a/src/tests/stub_HttpReply.cc
+++ b/src/tests/stub_HttpReply.cc
@@ -4,11 +4,10 @@
 #define STUB_API "HttpReply.cc"
 #include "tests/STUB.h"
 
-HttpReply::HttpReply() : HttpMsg(hoReply)
-{
-// XXX: required by testStore
-// STUB
-}
+HttpReply::HttpReply() : HttpMsg(hoReply), date (0), last_modified (0),
+        expires (0), surrogate_control (NULL), content_range (NULL), keep_alive (0),
+        protoPrefix("HTTP/"), bodySizeMax(-2)
+STUB_NOP
 HttpReply::~HttpReply() STUB
 void HttpReply::setHeaders(http_status status, const char *reason, const char *ctype, int64_t clen, time_t lmt, time_t expires_) STUB
 void HttpReply::packHeadersInto(Packer * p) const STUB
diff --git a/src/tests/stub_libsslsquid.cc b/src/tests/stub_libsslsquid.cc
index 08f3c5f26d..6bec9464d5 100644
--- a/src/tests/stub_libsslsquid.cc
+++ b/src/tests/stub_libsslsquid.cc
@@ -10,8 +10,7 @@
 #include "tests/STUB.h"
 
 #include "ssl/Config.h"
-Ssl::Config::Config() { printf("Ssl::Config::Config No implemented\n"); }
-Ssl::Config::~Config() { printf("Ssl::Config::Config No implemented\n"); }
+Ssl::Config::~Config() STUB_NOP
 Ssl::Config Ssl::TheConfig;
 
 #include "ssl/context_storage.h"
diff --git a/src/tests/testRock.h b/src/tests/testRock.h
index 2951d8ff42..5b0f00d4d3 100644
--- a/src/tests/testRock.h
+++ b/src/tests/testRock.h
@@ -15,6 +15,7 @@ class testRock : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST_SUITE_END();
 
 public:
+    testRock() : rr(NULL) {}
     virtual void setUp();
     virtual void tearDown();