From d9dbfd03c9b9d607644e40de3658cbe0d9a356e2 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 21 Jan 2013 21:35:13 -0700
Subject: [PATCH] Fix initialization of helper and doubly-linked list objects

  Detected by Coverity Scan. Issue 740565.
----------------------------------------------------
---
 src/acl/Gadgets.h |  2 +-
 src/dlink.h       |  6 +++++-
 src/helper.h      | 12 ++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/acl/Gadgets.h b/src/acl/Gadgets.h
index 49786b5e54..d59175cae2 100644
--- a/src/acl/Gadgets.h
+++ b/src/acl/Gadgets.h
@@ -3,12 +3,12 @@
 
 #include "err_type.h"
 
-struct dlink_list;
 class acl_access;
 class ACL;
 class AclDenyInfoList;
 class ACLList;
 class ConfigParser;
+class dlink_list;
 class StoreEntry;
 class wordlist;
 
diff --git a/src/dlink.h b/src/dlink.h
index d4a8bb361a..7ec7545665 100644
--- a/src/dlink.h
+++ b/src/dlink.h
@@ -41,7 +41,11 @@ public:
     dlink_node *next;
 };
 
-struct dlink_list {
+class dlink_list
+{
+public:
+    dlink_list() : head(NULL), tail(NULL) {}
+
     dlink_node *head;
     dlink_node *tail;
 };
diff --git a/src/helper.h b/src/helper.h
index d929049c26..150f1c7928 100644
--- a/src/helper.h
+++ b/src/helper.h
@@ -47,7 +47,15 @@ typedef void HLPSCB(void *, void *lastserver, char *buf);
 class helper
 {
 public:
-    inline helper(const char *name) : cmdline(NULL), id_name(name), eom('\n') {}
+    inline helper(const char *name) :
+            cmdline(NULL),
+            id_name(name),
+            ipc_type(0),
+            last_queue_warn(0),
+            last_restart(0),
+            eom('\n') {
+        memset(&stats, 0, sizeof(stats));
+    }
     ~helper();
 
 public:
@@ -76,7 +84,7 @@ private:
 class statefulhelper : public helper
 {
 public:
-    inline statefulhelper(const char *name) : helper(name) {};
+    inline statefulhelper(const char *name) : helper(name), datapool(NULL), IsAvailable(NULL), OnEmptyQueue(NULL) {};
     inline ~statefulhelper() {};
 
 public:
-- 
2.47.2