From: Anoop Saldanha <anoopsaldanha@gmail.com>
Date: Sat, 20 Oct 2012 14:31:52 +0000 (+0530)
Subject: fix flow deadlock issue in detection engine state introduced by tx api.
X-Git-Tag: suricata-1.4beta3~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdab6f2ab16bc49ac425ed97a803fdc1b0bd925e;p=thirdparty%2Fsuricata.git

fix flow deadlock issue in detection engine state introduced by tx api.

Issue discovered by coverity.
---

diff --git a/src/detect-engine-state.c b/src/detect-engine-state.c
index a6fc7a9948..f8b8ce854b 100644
--- a/src/detect-engine-state.c
+++ b/src/detect-engine-state.c
@@ -665,13 +665,13 @@ int DeStateDetectContinueDetection(ThreadVars *tv, DetectEngineCtx *de_ctx, Dete
                 if (htp_state->connp == NULL || htp_state->connp->conn == NULL) {
                     SCLogDebug("HTP state has no conn(p)");
                     FLOWLOCK_UNLOCK(f);
-                    SCReturnInt(0);
+                    goto end;
                 }
 
                 int tx_id = AppLayerTransactionGetInspectId(f);
                 if (tx_id == -1) {
                     FLOWLOCK_UNLOCK(f);
-                    SCReturnInt(0);
+                    goto end;
                 }
 
                 int total_txs = (int)list_size(htp_state->connp->conn->transactions);