Fix realloc error handling in threshold.config file parsing. Bug #1062.

12 years ago · b4631794a8
parent 35298a0146
commit b4631794a8
1 changed files with 14 additions and 8 deletions
--- a/src/util-threshold-config.c
+++ b/src/util-threshold-config.c
@ -1149,14 +1149,20 @@ void SCThresholdConfParseFile(DetectEngineCtx *de_ctx, FILE *fd)
        len = SCThresholdConfLineLength(fd);

        if (len > 0) {
-            if (line == NULL)
-                line = SCRealloc(line, len + 1);
-            else
-                line = SCRealloc(line, strlen(line) + len + 1);
-
+            if (line == NULL) {
+                line = SCMalloc(len + 1);
                if (unlikely(line == NULL)) {
                    SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
-                break;
+                    return;
+                }
+            } else {
+                char *newline = SCRealloc(line, strlen(line) + len + 1);
+                if (unlikely(newline == NULL)) {
+                    SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
+                    SCFree(line);
+                    return;
+                }
+                line = newline;
            }

            if (fgets(line + esc_pos, len + 1, fd) == NULL)