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 0f713c3ba31d410b6ad2b6948b4fcd0aa5477e00..8382e5e300c7183d9e107ceaea19f7b61962f813 100644 (file)
--- 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 906a830c4f1372468d2e956f3c21fa1658e14e9a..9d80860b14983c5746dc4270bcb0adcb0124d091 100644 (file)
--- 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 df30820c036797baa1bd3dcec898f274eec38051..8e63487d5d3658a88b2658474293c7444dd3b8bd 100644 (file)
--- 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;
 }