Merge pull request #1397 from micahsnyder/CLAM-2711-freshclam-sigtool…

…-clamconf-countlines-empty-lines Freshclam, Sigtool, Clamconf: fix database line count if has empty lines
Cisco-Talos · Jan 12, 2025 · 7f60cc7 · 7f60cc7
2 parents 73ee315 + 2e54498
commit 7f60cc7
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/common/misc.c b/common/misc.c
@@ -479,7 +479,15 @@ unsigned int countlines(const char *filename)
         return 0;
 
     while (fgets(buff, sizeof(buff), fh)) {
+        // ignore comments
         if (buff[0] == '#') continue;
+
+        // ignore empty lines in CR/LF format
+        if (buff[0] == '\r' && buff[1] == '\n') continue;
+
+        // ignore empty lines in LF format
+        if (buff[0] == '\n') continue;
+
         lines++;
     }