aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UAVCAN: SLCAN replace asserts with return false

Browse Source
This commit is contained in:
Siddharth Purohit 2019-01-23 11:54:27 +08:00 committed by Andrew Tridgell
parent e1a9094bf6
commit ed6fe450c0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_UAVCAN/AP_UAVCAN_SLCAN.cpp
View File

@ -105,7 +105,9 @@ bool SLCAN::CAN::handle_FrameDataExt(const char* cmd)
return false;
}
f.dlc = cmd[9] - '0';
assert(f.dlc <= uavcan::CanFrame::MaxDataLen);
if (f.dlc > uavcan::CanFrame::MaxDataLen) {
return false;
}
{
const char* p = &cmd[10];
for (unsigned i = 0; i < f.dlc; i++)
@ -133,7 +135,9 @@ bool SLCAN::CAN::handle_FrameDataStd(const char* cmd)
return false;
}
f.dlc = cmd[4] - '0';
assert(f.dlc <= uavcan::CanFrame::MaxDataLen);
if (f.dlc > uavcan::CanFrame::MaxDataLen) {
return false;
}
{
const char* p = &cmd[5];
for (unsigned i = 0; i < f.dlc; i++)