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

Null pointer checks

Browse Source
This commit is contained in:
Pavel Kirienko 2014-04-19 16:47:14 +04:00
parent efb2251ef8
commit acff3d274c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libuavcan/include/uavcan/node/global_data_type_registry.hpp
View File

@ -37,10 +37,14 @@ class UAVCAN_EXPORT GlobalDataTypeRegistry : Noncopyable
struct EntryInsertionComparator
{
const DataTypeID id;
explicit EntryInsertionComparator(Entry* dtd) : id(dtd->descriptor.getID()) { }
explicit EntryInsertionComparator(const Entry* dtd)
: id((dtd == NULL) ? DataTypeID() : dtd->descriptor.getID())
{
assert(dtd != NULL);
}
bool operator()(const Entry* entry) const
{
assert(entry);
assert(entry != NULL);
return entry->descriptor.getID() > id;
}
};

3
libuavcan/src/marshal/uc_scalar_codec.cpp
View File

@ -9,6 +9,7 @@ namespace uavcan
void ScalarCodec::swapByteOrder(uint8_t* const bytes, const unsigned len)
{
assert(bytes);
for (int i = 0, j = len - 1; i < j; i++, j--)
{
const uint8_t c = bytes[i];
@ -19,6 +20,7 @@ void ScalarCodec::swapByteOrder(uint8_t* const bytes, const unsigned len)
int ScalarCodec::encodeBytesImpl(uint8_t* const bytes, const unsigned bitlen)
{
assert(bytes);
// Underlying stream class assumes that more significant bits have lower index, so we need to shift some.
if (bitlen % 8)
{
@ -29,6 +31,7 @@ int ScalarCodec::encodeBytesImpl(uint8_t* const bytes, const unsigned bitlen)
int ScalarCodec::decodeBytesImpl(uint8_t* const bytes, const unsigned bitlen)
{
assert(bytes);
const int read_res = stream_.read(bytes, bitlen);
if (read_res > 0)
{