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

DataFlash: add sanity checks around EraseAll

This commit is contained in:
Peter Barker 2018-11-01 09:53:57 +11:00 committed by Randy Mackay
parent c0ad7d83f5
commit 46b035419e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/DataFlash/DataFlash_File.cpp
View File

@ -487,11 +487,18 @@ char *DataFlash_File::_lastlog_file_name(void) const
// remove all log files // remove all log files
void DataFlash_File::EraseAll() void DataFlash_File::EraseAll()
{ {
uint16_t log_num; if (hal.util->get_soft_armed()) {
// do not want to do any filesystem operations while we are e.g. flying
return;
}
if (!_initialised) {
return;
}
const bool was_logging = (_write_fd != -1); const bool was_logging = (_write_fd != -1);
stop_logging(); stop_logging();
for (log_num=1; log_num<=MAX_LOG_FILES; log_num++) { for (uint16_t log_num=1; log_num<=MAX_LOG_FILES; log_num++) {
char *fname = _log_file_name(log_num); char *fname = _log_file_name(log_num);
if (fname == nullptr) { if (fname == nullptr) {
break; break;