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

AP_Param: panic on failure to load defaults file

Browse Source
This commit is contained in:
Jonathan Challinger 2015-10-20 14:37:00 -07:00 committed by Andrew Tridgell
parent 0ffba07ec8
commit bde9a9421d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Param/AP_Param.cpp
View File

@ -1376,6 +1376,8 @@ bool AP_Param::load_defaults_file(const char *filename)
} }
if (!find_def_value_ptr(pname)) { if (!find_def_value_ptr(pname)) {
fclose(f); fclose(f);
::printf("invalid param %s in defaults file\n", pname);
AP_HAL::panic("AP_Param: Invalid param in defaults file");
return false; return false;
} }
num_defaults++; num_defaults++;
@ -1389,6 +1391,7 @@ bool AP_Param::load_defaults_file(const char *filename)
param_overrides = new param_override[num_defaults]; param_overrides = new param_override[num_defaults];
if (param_overrides == NULL) { if (param_overrides == NULL) {
AP_HAL::panic("AP_Param: Failed to allocate overrides");
return false; return false;
} }
@ -1397,6 +1400,7 @@ bool AP_Param::load_defaults_file(const char *filename)
*/ */
f = fopen(filename, "r"); f = fopen(filename, "r");
if (f == NULL) { if (f == NULL) {
AP_HAL::panic("AP_Param: Failed to re-open defaults file");
return false; return false;
} }
@ -1410,6 +1414,7 @@ bool AP_Param::load_defaults_file(const char *filename)
const float *def_value_ptr = find_def_value_ptr(pname); const float *def_value_ptr = find_def_value_ptr(pname);
if (!def_value_ptr) { if (!def_value_ptr) {
fclose(f); fclose(f);
AP_HAL::panic("AP_Param: Invalid param in defaults file");
return false; return false;
} }
param_overrides[idx].def_value_ptr = def_value_ptr; param_overrides[idx].def_value_ptr = def_value_ptr;
@ -1419,6 +1424,7 @@ bool AP_Param::load_defaults_file(const char *filename)
AP_Param *vp = AP_Param::find(pname, &var_type); AP_Param *vp = AP_Param::find(pname, &var_type);
if (!vp) { if (!vp) {
fclose(f); fclose(f);
AP_HAL::panic("AP_Param: Failed to set param default");
return false; return false;
} }
vp->set_float(value, var_type); vp->set_float(value, var_type);