rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

firmware: fix ISO date-time parsing (#4872) 

sscanf(isoDateTime, "%4lu-%2hhu-%2hhuT%2hhu:%2hhu:%2hhu", ...) would not
parse beyond the month when built for rusEFI, for unknown reasons,
though it works with a simplified test with GCC, hence the splayed
parsing

use sscanf over atoi for improved memory safety
This commit is contained in:
Nathan Schulte 2022-12-05 17:41:30 -06:00 committed by GitHub
parent 8381da9400
commit 9cd1760fa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/controllers/settings.cpp
View File

@ -1107,12 +1107,15 @@ void printDateTime() {
void setDateTime(const char * const isoDateTime) {
#if EFI_RTC
if (strlen(isoDateTime) > 0) {
if (strlen(isoDateTime) >= 19 && isoDateTime[10] == 'T') {
efidatetime_t dateTime;
if (sscanf("%04u-%02u-%02uT%02u:%02u:%02u", isoDateTime,
&dateTime.year, &dateTime.month, &dateTime.day,
&dateTime.hour, &dateTime.minute, &dateTime.second)
== 6) { // 6 fields to properly scan
int scanned = sscanf(isoDateTime, "%4lu", &dateTime.year);
scanned += sscanf(isoDateTime + 5, "%2hhu", &dateTime.month);
scanned += sscanf(isoDateTime + 8, "%2hhu", &dateTime.day);
scanned += sscanf(isoDateTime + 11, "%2hhu", &dateTime.hour);
scanned += sscanf(isoDateTime + 14, "%2hhu", &dateTime.minute);
scanned += sscanf(isoDateTime + 17, "%2hhu", &dateTime.second);
if (scanned == 6) { // 6 fields to properly scan
setRtcDateTime(&dateTime);
return;
}