Browse Source

UAVCAN: SLCAN replace asserts with return false

master
Siddharth Purohit 6 years ago committed by Andrew Tridgell
parent
commit
ed6fe450c0
  1. 8
      libraries/AP_UAVCAN/AP_UAVCAN_SLCAN.cpp

8
libraries/AP_UAVCAN/AP_UAVCAN_SLCAN.cpp

@ -105,7 +105,9 @@ bool SLCAN::CAN::handle_FrameDataExt(const char* cmd) @@ -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) @@ -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++)

Loading…
Cancel
Save