Merge remote-tracking branch 'origin/nfdump-filter-ng'

phaag · Feb 17, 2024 · 466c27b · 466c27b
2 parents 4f409e9 + bc08a0a
commit 466c27b
Show file tree

Hide file tree

Showing 95 changed files with 12,191 additions and 12,464 deletions.
diff --git a/man/nfdump.1 b/man/nfdump.1
@@ -593,10 +593,6 @@ Print full record as a separate json object.
 Legacy .csv format - will get removed in future releases. Please use
 .Sy json
 instead.
-.It Cm pipe
-Legacy '|' separated format - will get removed in future releases. Please use
-.Sy json
-instead.
 .El
 .Pp
 Already predefined fmt formats:

diff --git a/src/collector/collector.c b/src/collector/collector.c
@@ -471,10 +471,15 @@ int ScanExtension(char *extensionList) {
     if (list == NULL) return -1;
 
     // last entry
-    if (s == NULL) return 0;
-    if (*s == '\0') return 0;
+    if (s == NULL || *s == '\0') {
+        free(list);
+        list = s = NULL;
+        return 0;
+    }
 
     // scan next extension number
+
+    // skip white space
     while (*s && isspace(*s)) s++;
 
     // next separator
@@ -484,6 +489,7 @@ int ScanExtension(char *extensionList) {
 
     // wrong range of extension
     if (num == 0 || num >= MAXEXTENSIONS) {
+        free(list);
         s = list = NULL;
         return -1;
     }