v2.2 - fix crash when using -min

ColumPaget · ColumPaget · commit f0c57ddfb809 · 2025-03-11T19:56:32.000Z
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2.2 (2025-03-11)
+----------------
+  * Fix crash that can happen sometimes when using -min
+
 2.1 (2025-02-12)
 ----------------
   * If start and end patterns are defined, and -min or -max is used to exclude things by time, then exclude the entire block, rather than just lines within it.
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([timediff],[2.1],[colums.projects@gmail.com])
+AC_INIT([timediff],[2.2],[colums.projects@gmail.com])
 
 AC_PROG_CC
 AC_LANG([C])
diff --git a/main.c b/main.c
@@ -175,7 +175,7 @@ char *HandleStartEndBlock(char *RetStr, double secs, char *Line, struct timeval
     if ( (! StrValid(Settings.StartStrings)) && (! StrValid(Settings.EndStrings)) )
     {
         memcpy(PrevTime, CurrTime, sizeof(struct timeval));
-        printf("%s\n", Line);
+        if (StrValid(Line)) printf("%s\n", Line);
         return(CopyStr(RetStr, ""));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AC_INIT([timediff],[2.1],[[email protected]])`
	`1`	`+AC_INIT([timediff],[2.2],[[email protected]])`
`2`	`2`
`3`	`3`	`AC_PROG_CC`
`4`	`4`	`AC_LANG([C])`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ char HandleStartEndBlock(char RetStr, double secs, char *Line, struct timeval`
`175`	`175`	`if ( (! StrValid(Settings.StartStrings)) && (! StrValid(Settings.EndStrings)) )`
`176`	`176`	`{`
`177`	`177`	`memcpy(PrevTime, CurrTime, sizeof(struct timeval));`
`178`		`- printf("%s\n", Line);`
	`178`	`+ if (StrValid(Line)) printf("%s\n", Line);`
`179`	`179`	`return(CopyStr(RetStr, ""));`
`180`	`180`	`}`
`181`	`181`