From: Sascha Steinbiss <satta@debian.org>
Date: Mon, 3 Aug 2020 08:27:26 +0000 (+0200)
Subject: detect-mqtt: unify error handling in rule parsing
X-Git-Tag: suricata-6.0.0-beta1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93eef1da842f90270f0a7e00df107b4dbb087230;p=thirdparty%2Fsuricata.git

detect-mqtt: unify error handling in rule parsing

This is meant to provide a single path to the error case.
This might help make things more clear for static
checkers.
---

diff --git a/src/detect-mqtt-connack-sessionpresent.c b/src/detect-mqtt-connack-sessionpresent.c
index 0f713c3ba3..8382e5e300 100644
--- a/src/detect-mqtt-connack-sessionpresent.c
+++ b/src/detect-mqtt-connack-sessionpresent.c
@@ -154,8 +154,8 @@ static bool *DetectMQTTConnackSessionPresentParse(const char *rawstr)
     return de;
 
 error:
-    if (de != NULL)
-        SCFree(de);
+    /* de can't be NULL here */
+    SCFree(de);
     return NULL;
 }
 
diff --git a/src/detect-mqtt-connect-flags.c b/src/detect-mqtt-connect-flags.c
index 906a830c4f..9d80860b14 100644
--- a/src/detect-mqtt-connect-flags.c
+++ b/src/detect-mqtt-connect-flags.c
@@ -209,8 +209,8 @@ static DetectMQTTConnectFlagsData *DetectMQTTConnectFlagsParse(const char *rawst
     return de;
 
 error:
-    if (de != NULL)
-        SCFree(de);
+    /* de can't be NULL here */
+    SCFree(de);
     return NULL;
 }
 
diff --git a/src/detect-mqtt-flags.c b/src/detect-mqtt-flags.c
index df30820c03..8e63487d5d 100644
--- a/src/detect-mqtt-flags.c
+++ b/src/detect-mqtt-flags.c
@@ -189,8 +189,8 @@ static DetectMQTTFlagsData *DetectMQTTFlagsParse(const char *rawstr)
     return de;
 
 error:
-    if (de != NULL)
-        SCFree(de);
+    /* de can't be NULL here */
+    SCFree(de);
     return NULL;
 }