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

Fix -Werror=format-truncation on GCC 7

Browse Source 
Fix formatting

Check snprintf return for error AND overflow
This commit is contained in:
Julien Lecoeur
2017-05-30 16:54:17 +02:00
committed by Julian Oes
parent 407b403e68
commit 7929287f73
6 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_log_handler.cpp
+28 -15
View File
@@ -475,10 +475,13 @@ LogListHelper::_init()
if (result->d_type == PX4LOG_DIRECTORY) {
time_t tt = 0;
char log_path[128];
snprintf(log_path, sizeof(log_path), "%s/%s", kLogRoot, result->d_name);
int ret = snprintf(log_path, sizeof(log_path), "%s/%s", kLogRoot, result->d_name);
bool path_is_ok = (ret > 0) && (ret < sizeof(log_path));
if (_get_session_date(log_path, result->d_name, tt)) {
_scan_logs(f, log_path, tt);
if (path_is_ok) {
if (_get_session_date(log_path, result->d_name, tt)) {
_scan_logs(f, log_path, tt);
}
}
}
}
@@ -534,12 +537,15 @@ LogListHelper::_scan_logs(FILE *f, const char *dir, time_t &date)
time_t ldate = date;
uint32_t size = 0;
char log_file_path[128];
snprintf(log_file_path, sizeof(log_file_path), "%s/%s", dir, result->d_name);
int ret = snprintf(log_file_path, sizeof(log_file_path), "%s/%s", dir, result->d_name);
bool path_is_ok = (ret > 0) && (ret < sizeof(log_file_path));
if (_get_log_time_size(log_file_path, result->d_name, ldate, size)) {
//-- Write result->out to list file
fprintf(f, "%u %u %s\n", (unsigned)ldate, (unsigned)size, log_file_path);
log_count++;
if (path_is_ok) {
if (_get_log_time_size(log_file_path, result->d_name, ldate, size)) {
//-- Write result->out to list file
fprintf(f, "%u %u %s\n", (unsigned)ldate, (unsigned)size, log_file_path);
log_count++;
}
}
}
}
@@ -601,20 +607,27 @@ LogListHelper::delete_all(const char *dir)
if (result->d_type == PX4LOG_DIRECTORY && result->d_name[0] != '.') {
char log_path[128];
snprintf(log_path, sizeof(log_path), "%s/%s", dir, result->d_name);
LogListHelper::delete_all(log_path);
int ret = snprintf(log_path, sizeof(log_path), "%s/%s", dir, result->d_name);
bool path_is_ok = (ret > 0) && (ret < sizeof(log_path));
if (rmdir(log_path)) {
PX4LOG_WARN("MavlinkLogHandler::delete_all Error removing %s\n", log_path);
if (path_is_ok) {
LogListHelper::delete_all(log_path);
if (rmdir(log_path)) {
PX4LOG_WARN("MavlinkLogHandler::delete_all Error removing %s\n", log_path);
}
}
}
if (result->d_type == PX4LOG_REGULAR_FILE) {
char log_path[128];
snprintf(log_path, sizeof(log_path), "%s/%s", dir, result->d_name);
int ret = snprintf(log_path, sizeof(log_path), "%s/%s", dir, result->d_name);
bool path_is_ok = (ret > 0) && (ret < sizeof(log_path));
if (unlink(log_path)) {
PX4LOG_WARN("MavlinkLogHandler::delete_all Error deleting %s\n", log_path);
if (path_is_ok) {
if (unlink(log_path)) {
PX4LOG_WARN("MavlinkLogHandler::delete_all Error deleting %s\n", log_path);
}
}
}
}