Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Logger: use config error loop rather than abort

Browse Source 
Also add a specific check for the length of the labels field
This commit is contained in:
Peter Barker 2020-06-06 20:59:50 +10:00 committed by Peter Barker
parent f5f403947c
commit 0e964a4654
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_Logger/AP_Logger.cpp
View File

@ -9,6 +9,7 @@
#include <AP_InternalError/AP_InternalError.h>
#include <GCS_MAVLink/GCS.h>
#include <AP_BoardConfig/AP_BoardConfig.h>
AP_Logger *AP_Logger::_singleton;
@ -308,10 +309,14 @@ void AP_Logger::dump_structures(const struct LogStructure *logstructures, const
bool AP_Logger::labels_string_is_good(const char *labels) const
{
bool passed = true;
if (strlen(labels) >= LS_LABELS_SIZE) {
Debug("Labels string too long (%u > %u)", unsigned(strlen(labels)), unsigned(LS_LABELS_SIZE));
passed = false;
}
// This goes through and slices labels up into substrings by
// changing commas to nulls - keeping references to each string in
// label_offsets.
bool passed = true;
char *label_offsets[LS_LABELS_SIZE];
uint8_t label_offsets_offset = 0;
char labels_copy[LS_LABELS_SIZE];
@ -513,8 +518,7 @@ void AP_Logger::validate_structures(const struct LogStructure *logstructures, co
}
if (!passed) {
Debug("Log structures are invalid");
abort();
AP_BoardConfig::config_error("See console: Log structures invalid");
}
}
@ -915,8 +919,7 @@ void AP_Logger::assert_same_fmt_for_name(const AP_Logger::log_write_fmt *f,
passed = false;
}
if (!passed) {
Debug("Format definition must be consistent for every call of Write");
abort();
AP_BoardConfig::config_error("See console: Format definition must be consistent for every call of Write");
}
}
#endif
@ -1005,8 +1008,7 @@ AP_Logger::log_write_fmt *AP_Logger::msg_fmt_for_name(const char *name, const ch
memset((char*)ls_multipliers, '?', MIN(sizeof(ls_format), strlen(f->fmt)));
}
if (!validate_structure(&ls, (int16_t)-1)) {
Debug("Log structure invalid");
abort();
AP_BoardConfig::config_error("See console: Log structure invalid");
}
#endif