Fix optional nanosecond timestamp

The extension of the timestamp size is missing in log2asc.c and canplayer.c Fixes: 987bc8aac2 ("Optional nanosecond timestamp logging") Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Fix possible sscanf buffer overflow
2025-09-03 12:55:26 +02:00 · 2025-09-03 12:42:51 +02:00
2 changed files with 3 additions and 3 deletions
--- a/canplayer.c
+++ b/canplayer.c
@ -68,7 +68,7 @@
 #endif

 #define DEVSZ 22 /* IFNAMSZ + 6 */
-#define TIMESZ sizeof("(1345212884.318850)   ")
+#define TIMESZ sizeof("(1345212884.318850123)   ")
 #define BUFSZ (TIMESZ + DEVSZ + AFRSZ)

 /* adapt sscanf() functions below on error */
@ -547,7 +547,7 @@ int main(int argc, char **argv)
 					break;
 				}

-				if (sscanf(buf, "(%llu.%llu) %s %s", &sec, &usec, device, afrbuf) != 4) {
+				if (sscanf(buf, "(%llu.%llu) %21s %6299s", &sec, &usec, device, afrbuf) != 4) {
 					fprintf(stderr, "incorrect line format in logfile\n");
 					return 1;
 				}
--- a/log2asc.c
+++ b/log2asc.c
@ -296,7 +296,7 @@ static void canxl_asc(cu_t *cu, int devno, int mtu,

 #define DEVSZ 22
 #define EXTRASZ 20
-#define TIMESZ sizeof("(1345212884.318850)   ")
+#define TIMESZ sizeof("(1345212884.318850123)   ")
 #define BUFSZ (DEVSZ + AFRSZ + EXTRASZ + TIMESZ)

 /* adapt sscanf() functions below on error */
Author	SHA1	Message	Date
Oliver Hartkopp	8bf5f8873f	Fix optional nanosecond timestamp The extension of the timestamp size is missing in log2asc.c and canplayer.c Fixes: `987bc8aac2` ("Optional nanosecond timestamp logging") Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>	2025-09-03 12:55:26 +02:00
Rikus Wessels	0094905376	Fix possible sscanf buffer overflow	2025-09-03 12:42:51 +02:00