From: Victor Julien <victor@inliniac.net>
Date: Mon, 9 Dec 2013 18:02:42 +0000 (+0100)
Subject: htp: minor cleanup to silence cppcheck warning
X-Git-Tag: suricata-2.0beta2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76d3cb557b46c63b8cdfe87289f34364130eec52;p=thirdparty%2Fsuricata.git

htp: minor cleanup to silence cppcheck warning

[src/app-layer-htp.c:1967] -> [src/app-layer-htp.c:1978]: (warning) \
    Possible null pointer dereference: tx - otherwise it is redundant \
    to check it against null.
---

diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index c8e140db49..1cbcf73fcb 100644
--- a/src/app-layer-htp.c
+++ b/src/app-layer-htp.c
@@ -1975,14 +1975,12 @@ static int HTPCallbackResponse(htp_tx_t *tx) {
     /* Unset the body inspection (if any) */
     hstate->flags &=~ HTP_FLAG_NEW_BODY_SET;
 
-    if (tx != NULL) {
-        HtpTxUserData *htud = (HtpTxUserData *) htp_tx_get_user_data(tx);
-        if (htud != NULL) {
-            if (htud->tcflags & HTP_FILENAME_SET) {
-                SCLogDebug("closing file that was being stored");
-                (void)HTPFileClose(hstate, NULL, 0, 0, STREAM_TOCLIENT);
-                htud->tcflags &= ~HTP_FILENAME_SET;
-            }
+    HtpTxUserData *htud = (HtpTxUserData *) htp_tx_get_user_data(tx);
+    if (htud != NULL) {
+        if (htud->tcflags & HTP_FILENAME_SET) {
+            SCLogDebug("closing file that was being stored");
+            (void)HTPFileClose(hstate, NULL, 0, 0, STREAM_TOCLIENT);
+            htud->tcflags &= ~HTP_FILENAME_SET;
         }
     }