From: Victor Julien <victor@inliniac.net>
Date: Wed, 21 Dec 2016 18:43:25 +0000 (+0100)
Subject: tls.store: cleanup
X-Git-Tag: suricata-4.0.0-beta1~358
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b3a71a2859c125a8b461b88cf620d48d9c479ca;p=thirdparty%2Fsuricata.git

tls.store: cleanup
---

diff --git a/src/detect-tls.c b/src/detect-tls.c
index 4b5db38213..c86e55f20c 100644
--- a/src/detect-tls.c
+++ b/src/detect-tls.c
@@ -783,30 +783,22 @@ static int DetectTlsStoreSetup (DetectEngineCtx *de_ctx, Signature *s, char *str
 {
     SigMatch *sm = NULL;
 
-    s->flags |= SIG_FLAG_TLSSTORE;
-
-    sm = SigMatchAlloc();
-    if (sm == NULL)
-        goto error;
-
     if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_TLS) {
         SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");
-        goto error;
+        return -1;
     }
 
+    sm = SigMatchAlloc();
+    if (sm == NULL)
+        return -1;
+
     sm->type = DETECT_AL_TLS_STORE;
     s->flags |= SIG_FLAG_APPLAYER;
     s->alproto = ALPROTO_TLS;
+    s->flags |= SIG_FLAG_TLSSTORE;
 
     SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH);
-
     return 0;
-
-error:
-    if (sm != NULL)
-        SCFree(sm);
-    return -1;
-
 }
 
 /** \warning modifies state */