Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 10:26:52 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

parameters: require valid BSON document size

Browse Source
This commit is contained in:
Daniel Agar
2021-12-30 11:03:12 -05:00
parent 3514458f42
commit 1b6700592b
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/parameters/parameters.cpp
+17 -5
View File
@@ -1355,7 +1355,13 @@ static int param_verify(int fd)
} while (result > 0); } while (result > 0);
if (result == 0) { if (result == 0) {
return 0; if (decoder.total_document_size != decoder.total_decoded_size) {
PX4_ERR("BSON document size (%" PRId32 ") doesn't match bytes decoded (%" PRId32 ")", decoder.total_document_size,
decoder.total_decoded_size);
} else {
return 0;
}
} else if (result == -ENODATA) { } else if (result == -ENODATA) {
PX4_ERR("verify: no BSON data"); PX4_ERR("verify: no BSON data");
@@ -1613,11 +1619,17 @@ param_import_internal(int fd)
} while (result > 0); } while (result > 0);
if (result == 0) { if (result == 0) {
PX4_INFO("BSON document size %" PRId32 " bytes, decoded %" PRId32 " bytes (INT32:%" PRIu16 ", FLOAT:%" PRIu16 ")", if (decoder.total_document_size == decoder.total_decoded_size) {
decoder.total_document_size, decoder.total_decoded_size, PX4_INFO("BSON document size %" PRId32 " bytes, decoded %" PRId32 " bytes (INT32:%" PRIu16 ", FLOAT:%" PRIu16 ")",
decoder.count_node_int32, decoder.count_node_double); decoder.total_document_size, decoder.total_decoded_size,
decoder.count_node_int32, decoder.count_node_double);
return 0; return 0;
} else {
PX4_ERR("BSON document size (%" PRId32 ") doesn't match bytes decoded (%" PRId32 ")",
decoder.total_document_size, decoder.total_decoded_size);
}
} else if (result == -ENODATA) { } else if (result == -ENODATA) {
// silently retry as a precaution unless this is our last attempt // silently retry as a precaution unless this is our last attempt