fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-22 07:47:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Runtime checks for maximum DLC

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-30 20:04:19 +04:00
parent c5d4b81009
commit fc4d54ed86
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/driver/can.hpp
+10 -7
View File
@@ -26,22 +26,25 @@ struct CanFrame
static const uint32_t FlagRTR = 1 << 30; ///< Remote transmission request
static const uint32_t FlagERR = 1 << 29; ///< Error frame
uint32_t id; ///< CAN ID with flags (above)
uint8_t data[8];
uint8_t dlc; ///< Data Length Code
static const uint8_t MaxDataLen = 8;
uint32_t id; ///< CAN ID with flags (above)
uint8_t data[MaxDataLen];
uint8_t dlc; ///< Data Length Code
CanFrame()
: id(0)
, dlc(0)
{
std::fill(data, data + sizeof(data), 0);
std::fill(data, data + MaxDataLen, 0);
}
CanFrame(uint32_t id, const uint8_t* data, uint8_t dlc)
CanFrame(uint32_t id, const uint8_t* data, uint8_t data_len)
: id(id)
, dlc(dlc)
, dlc((data_len > MaxDataLen) ? MaxDataLen : data_len)
{
assert(data && dlc <= 8);
assert(data != NULL);
assert(data_len == dlc);
std::copy(data, data + dlc, this->data);
}
libuavcan/src/driver/can.cpp
+1
View File
@@ -15,6 +15,7 @@ const uint32_t CanFrame::MaskExtID;
const uint32_t CanFrame::FlagEFF;
const uint32_t CanFrame::FlagRTR;
const uint32_t CanFrame::FlagERR;
const uint8_t CanFrame::MaxDataLen;
std::string CanFrame::toString(StringRepresentation mode) const