Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_ADSB: use gmtime_r() instead of gmtime() 

using gmtime_r makes gmtime thread safe
This commit is contained in:
Andrew Tridgell 2024-02-07 09:32:49 +11:00
parent c0beda3235
commit 127c41f541
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/AP_ADSB/AP_ADSB_Sagetech.cpp
View File

@ -516,7 +516,8 @@ void AP_ADSB_Sagetech::send_msg_GPS()
if (loc.have_epoch_from_rtc_us) {
// not completely accurate, our time includes leap seconds and time_t should be without
const time_t time_sec = time_usec / 1000000;
struct tm* tm = gmtime(&time_sec);
struct tm tmd {};
struct tm* tm = gmtime_r(&time_sec, &tmd);
// format time string
snprintf((char*)&pkt.payload[36], 11, "%02u%02u%06.3f", tm->tm_hour, tm->tm_min, tm->tm_sec + (time_usec % 1000000) * 1.0e-6);

3
libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.cpp
View File

@ -633,7 +633,8 @@ void AP_ADSB_Sagetech_MXS::send_gps_msg()
uint64_t time_usec = ap_gps.epoch_from_rtc_us;
if (ap_gps.have_epoch_from_rtc_us) {
const time_t time_sec = time_usec * 1E-6;
struct tm* tm = gmtime(&time_sec);
struct tm tmd {};
struct tm* tm = gmtime_r(&time_sec, &tmd);
snprintf((char*)&gps.timeOfFix, 11, "%02u%02u%06.3f", tm->tm_hour, tm->tm_min, tm->tm_sec + (time_usec % 1000000) * 1.0e-6);
} else {