From: amosjeffries <>
Date: Sat, 4 Aug 2007 09:19:12 +0000 (+0000)
Subject: Fix, check for NULL pointer before state object cleanup and free.
X-Git-Tag: SQUID_3_0_PRE7~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1da78385ae43157ec9f66d9ed61323681e33e3b;p=thirdparty%2Fsquid.git

Fix, check for NULL pointer before state object cleanup and free.

Coverity checker picked up, StatefulRequest pointer having child fields
and CBDATA cleaned up then itself freed, even if it was NULL to start with.
---

diff --git a/src/helper.cc b/src/helper.cc
index 9de06437a3..c7b4377f58 100644
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: helper.cc,v 1.86 2007/08/03 02:22:52 amosjeffries Exp $
+ * $Id: helper.cc,v 1.87 2007/08/04 03:19:12 amosjeffries Exp $
  *
  * DEBUG: section 84    Helper process maintenance
  * AUTHOR: Harvest Derived?
@@ -1602,9 +1602,11 @@ helperRequestFree(helper_request * r)
 static void
 helperStatefulRequestFree(helper_stateful_request * r)
 {
-    cbdataReferenceDone(r->data);
-    xfree(r->buf);
-    delete r;
+    if(r) {
+        cbdataReferenceDone(r->data);
+        xfree(r->buf);
+        delete r;
+    }
 }
 
 // TODO: should helper_ and helper_stateful_ have a common parent?