fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 07:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use LOG_FILEPATH_SCANF_WIDTH macro for format specifier

Browse Source 
- Define LOG_FILEPATH_SCANF_WIDTH macro for the sscanf width specifier
- Replace hardcoded '255' with the named macro in both sscanf calls
- Improves maintainability and makes the relationship between buffer size and width explicit
- Addresses final code review feedback about magic numbers

Co-authored-by: dakejahl <37091262+dakejahl@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-12-15 21:49:01 +00:00
co-authored by dakejahl
parent 5cdc783b05
commit ca336fb299
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_log_handler.cpp
+8 -4
View File
@@ -59,6 +59,10 @@ static const char *kLogDir = PX4_STORAGEDIR "/log";
static_assert(PX4_MAX_FILEPATH >= MavlinkLogHandler::LOG_FILEPATH_SIZE, static_assert(PX4_MAX_FILEPATH >= MavlinkLogHandler::LOG_FILEPATH_SIZE,
"PX4_MAX_FILEPATH must be at least LOG_FILEPATH_SIZE bytes for log file paths"); "PX4_MAX_FILEPATH must be at least LOG_FILEPATH_SIZE bytes for log file paths");
// Width specifier for sscanf - must be LOG_FILEPATH_SIZE - 1
// This is hardcoded as 255 because preprocessor can't evaluate (256-1) in format strings
#define LOG_FILEPATH_SCANF_WIDTH "255"
MavlinkLogHandler::MavlinkLogHandler(Mavlink &mavlink) MavlinkLogHandler::MavlinkLogHandler(Mavlink &mavlink)
: _mavlink(mavlink) : _mavlink(mavlink)
{} {}
@@ -180,8 +184,8 @@ void MavlinkLogHandler::state_listing()
// If parsed lined successfully, send the entry // If parsed lined successfully, send the entry
// Note: Using width specifier to prevent buffer overflow // Note: Using width specifier to prevent buffer overflow
// Width is LOG_FILEPATH_SIZE-1 (255) to leave room for null terminator // Width is LOG_FILEPATH_SIZE-1 to leave room for null terminator
if (sscanf(line, "%" PRIu32 " %" PRIu32 " %255s", &time_utc, &size_bytes, filepath) != 3) { if (sscanf(line, "%" PRIu32 " %" PRIu32 " %" LOG_FILEPATH_SCANF_WIDTH "s", &time_utc, &size_bytes, filepath) != 3) {
PX4_DEBUG("sscanf failed"); PX4_DEBUG("sscanf failed");
continue; continue;
} }
@@ -514,8 +518,8 @@ bool MavlinkLogHandler::log_entry_from_id(uint16_t log_id, LogEntry *entry)
} }
// Parse log entry with width specifier to prevent buffer overflow // Parse log entry with width specifier to prevent buffer overflow
// Width is LOG_FILEPATH_SIZE-1 (255) to leave room for null terminator // Width is LOG_FILEPATH_SIZE-1 to leave room for null terminator
if (sscanf(line, "%" PRIu32 " %" PRIu32 " %255s", &(entry->time_utc), &(entry->size_bytes), entry->filepath) != 3) { if (sscanf(line, "%" PRIu32 " %" PRIu32 " %" LOG_FILEPATH_SCANF_WIDTH "s", &(entry->time_utc), &(entry->size_bytes), entry->filepath) != 3) {
PX4_DEBUG("sscanf failed"); PX4_DEBUG("sscanf failed");
continue; continue;
} }