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

AP_Param: fixed handling of long lines in defaults.parm 

lines longer than 100 bytes were causing the parsing to stop
This commit is contained in:
Andrew Tridgell 2022-10-05 12:32:24 +11:00
parent 1796cd5394
commit f7d5789b0e
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/AP_Param/AP_Param.cpp
View File

@ -2299,28 +2299,25 @@ bool AP_Param::load_defaults_file(const char *filename, bool last_pass)
bool AP_Param::count_embedded_param_defaults(uint16_t &count) bool AP_Param::count_embedded_param_defaults(uint16_t &count)
{ {
const volatile char *ptr = param_defaults_data.data; const volatile char *ptr = param_defaults_data.data;
uint16_t length = param_defaults_data.length; int32_t length = param_defaults_data.length;
count = 0; count = 0;
while (length) { while (length>0) {
char line[100]; char line[100];
char *pname; char *pname;
float value; float value;
bool read_only; bool read_only;
uint16_t i; uint16_t i;
uint16_t n = MIN(length, sizeof(line)-1); uint16_t n = length;
for (i=0;i<n;i++) { for (i=0;i<n;i++) {
if (ptr[i] == '\n') { if (ptr[i] == '\n') {
break; break;
} }
} }
if (i == n) {
// no newline uint16_t linelen = MIN(i,sizeof(line)-1);
break; memcpy(line, (void *)ptr, linelen);
} line[linelen] = 0;
memcpy(line, (void *)ptr, i);
line[i] = 0;
length -= i+1; length -= i+1;
ptr += i+1; ptr += i+1;
@ -2367,28 +2364,26 @@ void AP_Param::load_embedded_param_defaults(bool last_pass)
} }
const volatile char *ptr = param_defaults_data.data; const volatile char *ptr = param_defaults_data.data;
uint16_t length = param_defaults_data.length; int32_t length = param_defaults_data.length;
uint16_t idx = 0; uint16_t idx = 0;
while (idx < num_defaults && length) { while (idx < num_defaults && length > 0) {
char line[100]; char line[100];
char *pname; char *pname;
float value; float value;
bool read_only; bool read_only;
uint16_t i; uint16_t i;
uint16_t n = MIN(length, sizeof(line)-1); uint16_t n = length;
for (i=0;i<n;i++) { for (i=0;i<n;i++) {
if (ptr[i] == '\n') { if (ptr[i] == '\n') {
break; break;
} }
} }
if (i == n) {
// no newline uint16_t linelen = MIN(i,sizeof(line)-1);
break; memcpy(line, (void *)ptr, linelen);
} line[linelen] = 0;
memcpy(line, (void*)ptr, i);
line[i] = 0;
length -= i+1; length -= i+1;
ptr += i+1; ptr += i+1;