Merge 90383a0cca into 14245b7c79

Merge pull request #627 from SamantazFox/patch-2
J1939: Handle localtime_r() failure in TD PG
2026-05-11 14:10:35 +02:00 · 2026-05-11 10:16:48 +02:00 · 2026-05-08 17:00:31 +02:00
1 changed files with 16 additions and 10 deletions
--- a/j1939_timedate/j1939_timedate_srv.c
+++ b/j1939_timedate/j1939_timedate_srv.c
@ -41,6 +41,7 @@ static void gmtime_to_j1939_pgn_65254_td(struct j1939_time_date_packet *tdp)
 	utc_tm = gmtime_r(&now, &utc_tm_buf);
 	local_tm = localtime_r(&now, &local_tm_buf);

+	if (local_tm) {
 		/* Calculate the offsets */
 		hour_offset = local_tm->tm_hour - utc_tm->tm_hour;
 		minute_offset = local_tm->tm_min - utc_tm->tm_min;
@ -52,6 +53,11 @@ static void gmtime_to_j1939_pgn_65254_td(struct j1939_time_date_packet *tdp)
 			else
 				hour_offset -= 24;  /* before midnight */
 		}
+	} else {
+		/* The local time offsets cannot be determined at the moment */
+		hour_offset = 0xF9;
+		minute_offset = 0xFF;
+	}		

 	/*
 	 * Seconds (spn959):
Author	SHA1	Message	Date
Samantaz Fox	34b303e663	Merge `90383a0cca` into `14245b7c79`	2026-05-11 14:10:35 +02:00
Marc Kleine-Budde	14245b7c79	Merge pull request #627 from SamantazFox/patch-2 J1939: Handle localtime_r() failure in TD PG	2026-05-11 10:16:48 +02:00
Samantaz Fox	d5cb91c8ea	Handle localtime_r() failure in j1939 timedate When the call to localtime_r() fails (by returning NULL, as per the POSIX specification), make sure to fill the hour/minute offsets with the fallback values as specified in the J1939DA supporting information.	2026-05-08 17:00:31 +02:00