From: Victor Julien <victor@inliniac.net>
Date: Wed, 11 Dec 2013 12:26:55 +0000 (+0100)
Subject: debug: fix realloc error checking on flowbit print
X-Git-Tag: suricata-2.0beta2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F720%2Fhead;p=thirdparty%2Fsuricata.git

debug: fix realloc error checking on flowbit print

detect.c:1074:17: warning: Potential leak of memory pointed to by \
                                field 'debuglog_flowbits_names'
                return;

Bug #1062.
---

diff --git a/src/detect.c b/src/detect.c
index 7c8f55a922..682c8bb4ff 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -1067,12 +1067,16 @@ static void AlertDebugLogModeSyncFlowbitsNamesToPacketStruct(Packet *p, DetectEn
 
         if (i == p->debuglog_flowbits_names_len) {
             p->debuglog_flowbits_names_len += MALLOC_JUMP;
-            p->debuglog_flowbits_names = SCRealloc(p->debuglog_flowbits_names,
+            const char **names = SCRealloc(p->debuglog_flowbits_names,
                                                    sizeof(char *) *
                                                    p->debuglog_flowbits_names_len);
-            if (p->debuglog_flowbits_names == NULL) {
+            if (names == NULL) {
+                SCFree(p->debuglog_flowbits_names);
+                p->debuglog_flowbits_names = NULL;
+                p->debuglog_flowbits_names_len = 0;
                 return;
             }
+            p->debuglog_flowbits_names = names;
             memset(p->debuglog_flowbits_names +
                    p->debuglog_flowbits_names_len - MALLOC_JUMP,
                    0, sizeof(char *) * MALLOC_JUMP);