Fix spelling errors and some uaf errors

Author: phaag

ChangeLog

@@ -1,4 +1,5 @@
-- a22dcf0 2026-04-11  (HEAD -> master, origin/master, origin/HEAD) Cleanup filter code. Remove dead code
+- 2e3c995 2026-04-22  (HEAD -> master, origin/master, origin/HEAD) Update ChangeLog and fix minor bugs
+- a22dcf0 2026-04-11  Cleanup filter code. Remove dead code
 - 13259cc 2026-04-04  Merge pull request #671 from castillo-n/fix/ipv6-dst-anon-uses-src
 - 6e39712 2026-04-04  Fix naming of variables
 - 3f7df8c 2026-04-02  Fix IPv6 destination anonymization using wrong address

configure.ac

@@ -1,6 +1,6 @@
 
 AC_PREREQ([2.71])
-AC_INIT([nfdump], [1.7.7], [peter@people.ops-trust.net])
+AC_INIT([nfdump], [1.7.8], [peter@people.ops-trust.net])
 
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([subdir-objects])

src/collector/collector.c

@@ -494,7 +494,7 @@ static int RunCycle(time_t t_start, const char *time_extension, const collector_
                 fs->swap_nffile = nffile;
                 SetIdent(fs->swap_nffile, fs->Ident);
             } else {
-                LogError("Ident: %s, Can't re-open empty flow file");
+                LogError("Ident: %s, Can't re-open empty flow file", fs->Ident);
                 fs->swap_nffile = NULL;
                 // unrecoverable error
                 err++;
@@ -693,7 +693,7 @@ static void *post_processor_thread(void *args) {
     pthread_exit(NULL);
 }  // End of post_processor_thread
 
-int Lauch_postprocessor(post_args_t *post_args) {
+int Launch_postprocessor(post_args_t *post_args) {
     int err = pthread_mutex_init(&post_args->mutex, NULL);
     if (err != 0) {
         LogError("pthread_mutex_init() error in %s line %d: %s", __FILE__, __LINE__, strerror(err));
@@ -712,7 +712,7 @@ int Lauch_postprocessor(post_args_t *post_args) {
     }
 
     return 1;
-}  // End of Lauch_postprocessor
+}  // End of Launch_postprocessor
 
 void CleanupCollector(collector_ctx_t *ctx, post_args_t *post_args) {
     // wait for last cycle completed of post processor

src/collector/collector.h

@@ -115,7 +115,7 @@ int FlushInfoExporter(FlowSource_t *fs, exporter_info_record_t *exporter);
 
 int ScanExtension(char *extensionList);
 
-int Lauch_postprocessor(post_args_t *post_args);
+int Launch_postprocessor(post_args_t *post_args);
 
 void CleanupCollector(collector_ctx_t *ctx, post_args_t *post_args);
 

src/collector/flowsource.c

@@ -319,7 +319,7 @@ void expand_exporter_table(exporter_table_t *tab) {
     exporter_entry_t *old_entries = tab->entries;
 
     uint32_t new_cap = old_cap * 2;
-    dbg_printf("Expand eporter table old: %u -> new: %u\n", old_cap, new_cap);
+    dbg_printf("Expand exporter table old: %u -> new: %u\n", old_cap, new_cap);
     exporter_entry_t *new_entries = calloc(new_cap, sizeof(exporter_entry_t));
     if (!new_entries) {
         LogError("expand_exporter_table: calloc failed");
@@ -446,7 +446,7 @@ static int initFileInfo(FlowSource_t *fs, const char *ident, const char *dataDir
 
     return 1;
 
-}  // End of newFileInfo
+}  // End of initFileInfo
 
 static void expand_source_index(source_index_t *idx) {
     uint32_t old_cap = idx->capacity;

src/collector/launch.c

@@ -147,17 +147,19 @@ static char *cmd_expand(char *launch_process, launcher_args_t *launcher_args) {
                     s = NULL;
             }
             if (s) {
-                q = (char *)realloc(q, strlen(q) + strlen(s));
-                if (!q) {
+                char *qtmp = (char *)realloc(q, strlen(q) + strlen(s));
+                if (!qtmp) {
                     LogError("realloc() error in %s:%i: %s", __FILE__, __LINE__, strerror(errno));
+                    free(q);
                     return NULL;
                 }
+                q = qtmp;
                 // sanity check
                 if (strlen(q) > MAXCMDLEN) {
                     LogError("command expand error in %s:%i: cmd line too long", __FILE__, __LINE__);
                     return NULL;
                 }
-                memmove(&q[i] + strlen(s), &q[i + 2], strlen(&q[i + 2]) + 1);  // include trailing '0' in memmove
+                memmove(&q[i] + strlen(s), &q[i + 2], strlen(&q[i + 2]) + 1);  // include trailing '\0' in memmove
                 memcpy(&q[i], s, strlen(s));
             }
         }

src/collector/nfnet.c

@@ -164,7 +164,7 @@ int Unicast_receive_socket(const char *bindhost, const char *listenport, int fam
     }
 
     if (sockfd < 0) {
-        // serach for interface to bind
+        // search for interface to bind
         sockfd = search_socket(bindhost, listenport, &family);
         if (sockfd < 0) {
             LogError("Could not bind to %s:%s. No interface found", bindhost ? bindhost : "any", listenport);
@@ -183,7 +183,6 @@ int Unicast_receive_socket(const char *bindhost, const char *listenport, int fam
     }
 
     // ready
-    listen(sockfd, LISTEN_QUEUE);
 
     return sockfd;
 }
@@ -535,6 +534,7 @@ int LookupHost(char *hostname, char *port, struct sockaddr_in *addr) {
         LogError("getaddrinfo() error: %s", gai_strerror(error));
         return -1;
     }
+    struct addrinfo *resSave = res;
     while (res) {
         if (res->ai_family == AF_INET) {
             struct sockaddr_in *sa = (struct sockaddr_in *)res->ai_addr;
@@ -543,5 +543,7 @@ int LookupHost(char *hostname, char *port, struct sockaddr_in *addr) {
         }
         res = res->ai_next;
     }
-    return res ? 0 : -1;
+    int retVal = res ? 0 : -1;
+    freeaddrinfo(resSave);
+    return retVal;
 }  // End of LookupHost

src/libnffile/flist.c

@@ -127,7 +127,7 @@
  *	-R /path/to/source1 -R /path/to/source2 [-R ...]
  *
  *
- * Hierarchical file organinisation:
+ * Hierarchical file organisation:
  * For performance reasons, files may be store in various sub directories instead of a
  * single directory. These sub directories are assumed to be created in alphabetical order.
  * For example daily sub directories: 2006/04/01 .. 2006/04/30 as created by nfcapd with

src/libnffile/nffile.c

@@ -287,7 +287,7 @@ static int ZSTD_initialize(void) {
 #ifdef HAVE_ZSTD
     size_t const cBuffSize = ZSTD_compressBound(WRITE_BUFFSIZE);
     if (cBuffSize > (BUFFSIZE - sizeof(dataBlock_t))) {
-        LogError("LZSTD_compressBound() error in %s line %d: Buffer too small", __FILE__, __LINE__);
+        LogError("ZSTD_compressBound() error in %s line %d: Buffer too small", __FILE__, __LINE__);
         return 0;
     }
     return 1;
@@ -311,7 +311,7 @@ static int Compress_Block_LZO(dataBlock_t *in_block, dataBlock_t *out_block, siz
     r = lzo1x_1_compress(in, in_len, out, &out_len, wrkmem);
 
     if (r != LZO_E_OK) {
-        LogError("Compress_Block_LZO() error compression failed in %s line %d: LZ0 : %d", __FILE__, __LINE__, r);
+        LogError("Compress_Block_LZO() error compression failed in %s line %d: LZO : %d", __FILE__, __LINE__, r);
         return -1;
     }
 
@@ -388,11 +388,11 @@ static int Uncompress_Block_LZ4(dataBlock_t *in_block, dataBlock_t *out_block, s
 
     int out_len = LZ4_decompress_safe(in, out, in_len, block_size);
     if (out_len == 0) {
-        LogError("LZ4_decompress_safe() error compression aborted in %s line %d: LZ4 : buffer too small", __FILE__, __LINE__);
+        LogError("LZ4_decompress_safe() error decompression aborted in %s line %d: LZ4 : buffer too small", __FILE__, __LINE__);
         return -1;
     }
     if (out_len < 0) {
-        LogError("LZ4_decompress_safe() error compression failed in %s line %d: LZ4 : %d", __FILE__, __LINE__, out_len);
+        LogError("LZ4_decompress_safe() error decompression failed in %s line %d: LZ4 : %d", __FILE__, __LINE__, out_len);
         return -1;
     }
 
@@ -419,7 +419,7 @@ static int Compress_Block_BZ2(dataBlock_t *in_block, dataBlock_t *out_block, siz
         int r = BZ2_bzCompress(&bs, BZ_FINISH);
         if (r == BZ_FINISH_OK) continue;
         if (r != BZ_STREAM_END) {
-            LogError("Compress_Block_BZ2() error compression failed in %s line %d: LZ4 : %d", __FILE__, __LINE__, r);
+            LogError("Compress_Block_BZ2() error compression failed in %s line %d: BZ2 : %d", __FILE__, __LINE__, r);
             return -1;
         }
         break;
@@ -483,7 +483,7 @@ static int Compress_Block_ZSTD(dataBlock_t *in_block, dataBlock_t *out_block, si
     int out_len = ZSTD_compress(out, block_size, in, in_len, level);
 
     if (ZSTD_isError(out_len)) {
-        LogError("Compress_Block_ZSTD() error compression aborted in %s line %d: LZ4 : buffer too small", __FILE__, __LINE__);
+        LogError("Compress_Block_ZSTD() error compression aborted in %s line %d: ZSTD : buffer too small", __FILE__, __LINE__);
         return -1;
     }
 
@@ -506,7 +506,7 @@ static int Uncompress_Block_ZSTD(dataBlock_t *in_block, dataBlock_t *out_block,
 
     size_t out_len = ZSTD_decompress(out, block_size, in, in_len);
     if (ZSTD_isError(out_len)) {
-        LogError("LZ4_decompress_safe() error compression aborted in %s line %d: LZ4 : buffer too small", __FILE__, __LINE__);
+        LogError("ZSTD_decompress() error decompression aborted in %s line %d: ZSTD : %s", __FILE__, __LINE__, ZSTD_getErrorName(out_len));
         return -1;
     }
 
@@ -626,7 +626,7 @@ static int WriteAppendix(nffile_t *nffile) {
         return 0;
     }
 
-    // set appendx info
+    // set appendix info
     nffile->file_header->offAppendix = currentPos;
     nffile->file_header->appendixBlocks = 1;
 
@@ -698,14 +698,14 @@ static nffile_t *NewFile(uint32_t num_workers) {
     if (!nffile->file_header) {
         LogError("malloc() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
         free(nffile);
-        return NULL;
+        return NULL; // file_header allocation failed; nffile itself is freed
     }
 
     nffile->stat_record = calloc(1, sizeof(stat_record_t));
     if (!nffile->stat_record) {
         LogError("malloc() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
-        free(nffile);
         free(nffile->file_header);
+        free(nffile);
         return NULL;
     }
 
@@ -715,9 +715,9 @@ static nffile_t *NewFile(uint32_t num_workers) {
     //
     nffile->processQueue = queue_init(QueueSize);
     if (!nffile->processQueue) {
-        free(nffile);
         free(nffile->file_header);
         free(nffile->stat_record);
+        free(nffile);
         return NULL;
     }
 
@@ -862,14 +862,14 @@ nffile_t *OpenNewFile(const char *filename, unsigned creator, unsigned compress,
 
 #ifndef HAVE_ZSTD
     if ((compress & 0xFFFF) == ZSTD_COMPRESSED) {
-        LogError("OpenNewfiles: ZSTD compression not compiled in");
+        LogError("OpenNewFile: ZSTD compression not compiled in");
         return NULL;
     }
 #endif
 
 #ifndef HAVE_BZ2
     if ((compress & 0xFFFF) == BZ2_COMPRESSED) {
-        LogError("OpenNewfiles: BZIP2 compression not compiled in");
+        LogError("OpenNewFile: BZIP2 compression not compiled in");
         return NULL;
     }
 #endif
@@ -1909,7 +1909,7 @@ int QueryFile(char *filename, int verbose) {
                         }
                     }
                     if (recordHeader->type == SlackRecord) {
-                        printf(" slac record");
+                        printf(" slack record");
                     }
 
                     printf("\n");
@@ -2116,6 +2116,6 @@ void PrintGNUplotSumStat(nffile_t *nffile) {
         printf("%s,%llu,%llu,%llu\n", datestr, (long long unsigned)nffile->stat_record->numflows, (long long unsigned)nffile->stat_record->numpackets,
                (long long unsigned)nffile->stat_record->numbytes);
     } else {
-        printf("No datstring\n");
+        printf("No datestring\n");
     }
 }  // End of PrintGNUplotSumStat

src/netflow/ipfix.c

@@ -526,10 +526,10 @@ static void InsertSampler(FlowSource_t *fs, exporter_entry_t *exporter_entry, sa
                 // found same sampler id - update record if changed
                 if (sampler_record->algorithm != sampler->record.algorithm || sampler_record->packetInterval != sampler->record.packetInterval ||
                     sampler_record->spaceInterval != sampler->record.spaceInterval) {
-                    fs->dataBlock = AppendToBuffer(fs->nffile, fs->dataBlock, &(sampler->record), sampler->record.size);
                     sampler->record.algorithm = sampler_record->algorithm;
                     sampler->record.packetInterval = sampler_record->packetInterval;
                     sampler->record.spaceInterval = sampler_record->spaceInterval;
+                    fs->dataBlock = AppendToBuffer(fs->nffile, fs->dataBlock, &(sampler->record), sampler->record.size);
                     LogInfo("Update existing sampler id: %" PRId64 ", algorithm: %u, packet interval: %u, packet space: %u", sampler_record->id,
                             sampler_record->algorithm, sampler_record->packetInterval, sampler_record->spaceInterval);
                     dbg_printf("Update existing sampler id: %" PRId64 " , algorithm: %u, packet interval: %u, packet space: %u\n", sampler_record->id,
@@ -969,7 +969,7 @@ static void Process_ipfix_option_templates(exporter_entry_t *exporter_entry, voi
     dbg_printf("Decode Option Template. tableID: %u, field count: %u, scope field count: %u\n", tableID, field_count, scope_field_count);
 
     if (scope_field_count == 0) {
-        LogError("Process_ipfx: [%u] scope field count error: length must not be zero", exporter_entry->info.id);
+        LogError("Process_ipfix: [%u] scope field count error: length must not be zero", exporter_entry->info.id);
         dbg_printf("scope field count error: length must not be zero\n");
         return;
     }
@@ -985,11 +985,6 @@ static void Process_ipfix_option_templates(exporter_entry_t *exporter_entry, voi
         return;
     }
 
-    if (scope_field_count == 0) {
-        LogError("Process_ipfxi: [%u] scope field count error: length must not be zero", exporter_entry->info.id);
-        return;
-    }
-
     removeTemplate(exporter_entry, tableID);
     optionTemplate_t *optionTemplate = (optionTemplate_t *)calloc(1, sizeof(optionTemplate_t));
     if (!optionTemplate) {
@@ -1449,7 +1444,7 @@ static void Process_ipfix_data(exporter_entry_t *exporter_entry, uint32_t Export
             }
 
             UpdateFirstLast(fs->nffile, genericFlow->msecFirst, genericFlow->msecLast);
-            dbg_printf("msecFrist: %" PRIu64 "\n", genericFlow->msecFirst);
+            dbg_printf("msecFirst: %" PRIu64 "\n", genericFlow->msecFirst);
             dbg_printf("msecLast : %" PRIu64 "\n", genericFlow->msecLast);
             dbg_printf("packets : %" PRIu64 "\n", genericFlow->inPackets);
             dbg_printf("bytes : %" PRIu64 "\n", genericFlow->inBytes);