forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use pointer assert

Browse source
This commit is contained in:
jgromes 2024-10-26 16:59:13 +01:00
parent 6b05e9fd23
commit 3952fe9139
6 changed files with 27 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/modules/LR11x0/LR11x0.cpp
View file

@ -1571,9 +1571,7 @@ int16_t LR11x0::getWifiScanResultsCount(uint8_t* count) {
} }
int16_t LR11x0::getWifiScanResult(LR11x0WifiResult_t* result, uint8_t index, bool brief) { int16_t LR11x0::getWifiScanResult(LR11x0WifiResult_t* result, uint8_t index, bool brief) {
if(!result) { RADIOLIB_ASSERT_PTR(result);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
// read a single result // read a single result
uint8_t format = brief ? RADIOLIB_LR11X0_WIFI_RESULT_TYPE_BASIC : RADIOLIB_LR11X0_WIFI_RESULT_TYPE_COMPLETE; uint8_t format = brief ? RADIOLIB_LR11X0_WIFI_RESULT_TYPE_BASIC : RADIOLIB_LR11X0_WIFI_RESULT_TYPE_COMPLETE;
@ -1647,9 +1645,7 @@ int16_t LR11x0::getWifiScanResult(LR11x0WifiResult_t* result, uint8_t index, boo
} }
int16_t LR11x0::wifiScan(uint8_t wifiType, uint8_t* count, uint8_t mode, uint16_t chanMask, uint8_t numScans, uint16_t timeout) { int16_t LR11x0::wifiScan(uint8_t wifiType, uint8_t* count, uint8_t mode, uint16_t chanMask, uint8_t numScans, uint16_t timeout) {
if(!count) { RADIOLIB_ASSERT_PTR(count);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
// start scan // start scan
RADIOLIB_DEBUG_BASIC_PRINTLN("WiFi scan start"); RADIOLIB_DEBUG_BASIC_PRINTLN("WiFi scan start");
@ -1674,9 +1670,7 @@ int16_t LR11x0::wifiScan(uint8_t wifiType, uint8_t* count, uint8_t mode, uint16_
} }
int16_t LR11x0::getVersionInfo(LR11x0VersionInfo_t* info) { int16_t LR11x0::getVersionInfo(LR11x0VersionInfo_t* info) {
if(!info) { RADIOLIB_ASSERT_PTR(info);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
int16_t state = this->getVersion(&info->hardware, &info->device, &info->fwMajor, &info->fwMinor); int16_t state = this->getVersion(&info->hardware, &info->device, &info->fwMajor, &info->fwMinor);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
@ -1696,9 +1690,7 @@ int16_t LR11x0::getVersionInfo(LR11x0VersionInfo_t* info) {
} }
int16_t LR11x0::updateFirmware(const uint32_t* image, size_t size, bool nonvolatile) { int16_t LR11x0::updateFirmware(const uint32_t* image, size_t size, bool nonvolatile) {
if(!image) { RADIOLIB_ASSERT_PTR(image);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
// put the device to bootloader mode // put the device to bootloader mode
int16_t state = this->reboot(true); int16_t state = this->reboot(true);
@ -1802,9 +1794,7 @@ int16_t LR11x0::isGnssScanCapable() {
} }
int16_t LR11x0::gnssScan(LR11x0GnssResult_t* res) { int16_t LR11x0::gnssScan(LR11x0GnssResult_t* res) {
if(!res) { RADIOLIB_ASSERT_PTR(res);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
// go to standby // go to standby
int16_t state = standby(); int16_t state = standby();
@ -1872,9 +1862,7 @@ int16_t LR11x0::gnssScan(LR11x0GnssResult_t* res) {
} }
int16_t LR11x0::getGnssAlmanacStatus(LR11x0GnssAlmanacStatus_t *stat) { int16_t LR11x0::getGnssAlmanacStatus(LR11x0GnssAlmanacStatus_t *stat) {
if(!stat) { RADIOLIB_ASSERT_PTR(stat);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
// save the time the time until subframe is relative to // save the time the time until subframe is relative to
stat->start = this->mod->hal->millis(); stat->start = this->mod->hal->millis();
@ -1913,9 +1901,7 @@ int16_t LR11x0::getGnssAlmanacStatus(LR11x0GnssAlmanacStatus_t *stat) {
} }
int16_t LR11x0::gnssDelayUntilSubframe(LR11x0GnssAlmanacStatus_t *stat, uint8_t constellation) { int16_t LR11x0::gnssDelayUntilSubframe(LR11x0GnssAlmanacStatus_t *stat, uint8_t constellation) {
if(!stat) { RADIOLIB_ASSERT_PTR(stat);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
// almanac update has to be called at least 1.3 seconds before the subframe // almanac update has to be called at least 1.3 seconds before the subframe
// we use 2.3 seconds to be on the safe side // we use 2.3 seconds to be on the safe side
@ -1969,9 +1955,7 @@ int16_t LR11x0::updateGnssAlmanac(uint8_t constellation) {
} }
int16_t LR11x0::getGnssPosition(LR11x0GnssPosition_t* pos, bool filtered) { int16_t LR11x0::getGnssPosition(LR11x0GnssPosition_t* pos, bool filtered) {
if(!pos) { RADIOLIB_ASSERT_PTR(pos);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
uint8_t error = 0; uint8_t error = 0;
int16_t state; int16_t state;
@ -1991,7 +1975,8 @@ int16_t LR11x0::getGnssPosition(LR11x0GnssPosition_t* pos, bool filtered) {
} }
int16_t LR11x0::getGnssSatellites(LR11x0GnssSatellite_t* sats, uint8_t numSats) { int16_t LR11x0::getGnssSatellites(LR11x0GnssSatellite_t* sats, uint8_t numSats) {
if((!sats) || (numSats >= 32)) { RADIOLIB_ASSERT_PTR(sats);
if(numSats >= 32) {
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED); return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
} }
@ -2010,9 +1995,7 @@ int16_t LR11x0::getGnssSatellites(LR11x0GnssSatellite_t* sats, uint8_t numSats)
} }
int16_t LR11x0::getModem(ModemType_t* modem) { int16_t LR11x0::getModem(ModemType_t* modem) {
if(!modem) { RADIOLIB_ASSERT_PTR(modem);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
uint8_t packetType = RADIOLIB_LR11X0_PACKET_TYPE_NONE; uint8_t packetType = RADIOLIB_LR11X0_PACKET_TYPE_NONE;
int16_t state = getPacketType(&packetType); int16_t state = getPacketType(&packetType);
@ -2577,23 +2560,17 @@ int16_t LR11x0::readInfoPage(uint16_t addr, uint32_t* data, size_t len) {
} }
int16_t LR11x0::getChipEui(uint8_t* eui) { int16_t LR11x0::getChipEui(uint8_t* eui) {
if(!eui) { RADIOLIB_ASSERT_PTR(eui);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
return(this->SPIcommand(RADIOLIB_LR11X0_CMD_GET_CHIP_EUI, false, eui, RADIOLIB_LR11X0_EUI_LEN)); return(this->SPIcommand(RADIOLIB_LR11X0_CMD_GET_CHIP_EUI, false, eui, RADIOLIB_LR11X0_EUI_LEN));
} }
int16_t LR11x0::getSemtechJoinEui(uint8_t* eui) { int16_t LR11x0::getSemtechJoinEui(uint8_t* eui) {
if(!eui) { RADIOLIB_ASSERT_PTR(eui);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
return(this->SPIcommand(RADIOLIB_LR11X0_CMD_GET_SEMTECH_JOIN_EUI, false, eui, RADIOLIB_LR11X0_EUI_LEN)); return(this->SPIcommand(RADIOLIB_LR11X0_CMD_GET_SEMTECH_JOIN_EUI, false, eui, RADIOLIB_LR11X0_EUI_LEN));
} }
int16_t LR11x0::deriveRootKeysAndGetPin(uint8_t* pin) { int16_t LR11x0::deriveRootKeysAndGetPin(uint8_t* pin) {
if(!pin) { RADIOLIB_ASSERT_PTR(pin);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
return(this->SPIcommand(RADIOLIB_LR11X0_CMD_DERIVE_ROOT_KEYS_AND_GET_PIN, false, pin, RADIOLIB_LR11X0_PIN_LEN)); return(this->SPIcommand(RADIOLIB_LR11X0_CMD_DERIVE_ROOT_KEYS_AND_GET_PIN, false, pin, RADIOLIB_LR11X0_PIN_LEN));
} }
@ -2689,9 +2666,7 @@ int16_t LR11x0::getRssiInst(float* rssi) {
} }
int16_t LR11x0::setGfskSyncWord(uint8_t* sync) { int16_t LR11x0::setGfskSyncWord(uint8_t* sync) {
if(!sync) { RADIOLIB_ASSERT_PTR(sync);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
return(this->SPIcommand(RADIOLIB_LR11X0_CMD_SET_GFSK_SYNC_WORD, true, sync, RADIOLIB_LR11X0_GFSK_SYNC_WORD_LEN)); return(this->SPIcommand(RADIOLIB_LR11X0_CMD_SET_GFSK_SYNC_WORD, true, sync, RADIOLIB_LR11X0_GFSK_SYNC_WORD_LEN));
} }
@ -3340,9 +3315,7 @@ int16_t LR11x0::gnssGetResultSize(uint16_t* size) {
} }
int16_t LR11x0::gnssReadResults(uint8_t* result, uint16_t size) { int16_t LR11x0::gnssReadResults(uint8_t* result, uint16_t size) {
if(!result) { RADIOLIB_ASSERT_PTR(result);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
return(this->SPIcommand(RADIOLIB_LR11X0_CMD_GNSS_READ_RESULTS, false, result, size)); return(this->SPIcommand(RADIOLIB_LR11X0_CMD_GNSS_READ_RESULTS, false, result, size));
} }
@ -3639,9 +3612,7 @@ void LR11x0::gnssAbort() {
} }
int16_t LR11x0::cryptoSetKey(uint8_t keyId, uint8_t* key) { int16_t LR11x0::cryptoSetKey(uint8_t keyId, uint8_t* key) {
if(!key) { RADIOLIB_ASSERT_PTR(key);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
uint8_t buff[1 + RADIOLIB_AES128_KEY_SIZE] = { 0 }; uint8_t buff[1 + RADIOLIB_AES128_KEY_SIZE] = { 0 };
buff[0] = keyId; buff[0] = keyId;
memcpy(&buff[1], key, RADIOLIB_AES128_KEY_SIZE); memcpy(&buff[1], key, RADIOLIB_AES128_KEY_SIZE);
@ -3649,9 +3620,7 @@ int16_t LR11x0::cryptoSetKey(uint8_t keyId, uint8_t* key) {
} }
int16_t LR11x0::cryptoDeriveKey(uint8_t srcKeyId, uint8_t dstKeyId, uint8_t* key) { int16_t LR11x0::cryptoDeriveKey(uint8_t srcKeyId, uint8_t dstKeyId, uint8_t* key) {
if(!key) { RADIOLIB_ASSERT_PTR(key);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
uint8_t buff[2 + RADIOLIB_AES128_KEY_SIZE] = { 0 }; uint8_t buff[2 + RADIOLIB_AES128_KEY_SIZE] = { 0 };
buff[0] = srcKeyId; buff[0] = srcKeyId;
buff[1] = dstKeyId; buff[1] = dstKeyId;
@ -3849,23 +3818,17 @@ int16_t LR11x0::bootReboot(bool stay) {
} }
int16_t LR11x0::bootGetPin(uint8_t* pin) { int16_t LR11x0::bootGetPin(uint8_t* pin) {
if(!pin) { RADIOLIB_ASSERT_PTR(pin);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
return(this->SPIcommand(RADIOLIB_LR11X0_CMD_BOOT_GET_PIN, false, pin, RADIOLIB_LR11X0_PIN_LEN)); return(this->SPIcommand(RADIOLIB_LR11X0_CMD_BOOT_GET_PIN, false, pin, RADIOLIB_LR11X0_PIN_LEN));
} }
int16_t LR11x0::bootGetChipEui(uint8_t* eui) { int16_t LR11x0::bootGetChipEui(uint8_t* eui) {
if(!eui) { RADIOLIB_ASSERT_PTR(eui);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
return(this->SPIcommand(RADIOLIB_LR11X0_CMD_BOOT_GET_CHIP_EUI, false, eui, RADIOLIB_LR11X0_EUI_LEN)); return(this->SPIcommand(RADIOLIB_LR11X0_CMD_BOOT_GET_CHIP_EUI, false, eui, RADIOLIB_LR11X0_EUI_LEN));
} }
int16_t LR11x0::bootGetJoinEui(uint8_t* eui) { int16_t LR11x0::bootGetJoinEui(uint8_t* eui) {
if(!eui) { RADIOLIB_ASSERT_PTR(eui);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
return(this->SPIcommand(RADIOLIB_LR11X0_CMD_BOOT_GET_JOIN_EUI, false, eui, RADIOLIB_LR11X0_EUI_LEN)); return(this->SPIcommand(RADIOLIB_LR11X0_CMD_BOOT_GET_JOIN_EUI, false, eui, RADIOLIB_LR11X0_EUI_LEN));
} }

4
src/modules/SX126x/SX126x.cpp
View file

@ -1663,9 +1663,7 @@ int16_t SX126x::invertIQ(bool enable) {
} }
int16_t SX126x::getModem(ModemType_t* modem) { int16_t SX126x::getModem(ModemType_t* modem) {
if(!modem) { RADIOLIB_ASSERT_PTR(modem);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
uint8_t packetType = getPacketType(); uint8_t packetType = getPacketType();
switch(packetType) { switch(packetType) {

4
src/modules/SX127x/SX127x.cpp
View file

@ -1755,9 +1755,7 @@ int16_t SX127x::invertIQ(bool enable) {
} }
int16_t SX127x::getModem(ModemType_t* modem) { int16_t SX127x::getModem(ModemType_t* modem) {
if(!modem) { RADIOLIB_ASSERT_PTR(modem);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
int16_t packetType = getActiveModem(); int16_t packetType = getActiveModem();
switch(packetType) { switch(packetType) {

4
src/modules/SX128x/SX128x.cpp
View file

@ -870,9 +870,7 @@ int16_t SX128x::setModem(ModemType_t modem) {
} }
int16_t SX128x::getModem(ModemType_t* modem) { int16_t SX128x::getModem(ModemType_t* modem) {
if(!modem) { RADIOLIB_ASSERT_PTR(modem);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
uint8_t packetType = getPacketType(); uint8_t packetType = getPacketType();
switch(packetType) { switch(packetType) {

4
src/protocols/Pager/Pager.cpp
View file

@ -316,9 +316,7 @@ int16_t PagerClient::readData(String& str, size_t len, uint32_t* addr) {
uint8_t data[RADIOLIB_STATIC_ARRAY_SIZE + 1]; uint8_t data[RADIOLIB_STATIC_ARRAY_SIZE + 1];
#else #else
uint8_t* data = new uint8_t[length + 1]; uint8_t* data = new uint8_t[length + 1];
if(!data) { RADIOLIB_ASSERT_PTR(data);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
#endif #endif
// read the received data // read the received data

8
src/protocols/PhysicalLayer/PhysicalLayer.cpp
View file

@ -78,9 +78,7 @@ int16_t PhysicalLayer::receive(String& str, size_t len) {
} else { } else {
data = new uint8_t[length + 1]; data = new uint8_t[length + 1];
} }
if(!data) { RADIOLIB_ASSERT_PTR(data);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
#endif #endif
// attempt packet reception // attempt packet reception
@ -180,9 +178,7 @@ int16_t PhysicalLayer::readData(String& str, size_t len) {
uint8_t data[RADIOLIB_STATIC_ARRAY_SIZE + 1]; uint8_t data[RADIOLIB_STATIC_ARRAY_SIZE + 1];
#else #else
uint8_t* data = new uint8_t[length + 1]; uint8_t* data = new uint8_t[length + 1];
if(!data) { RADIOLIB_ASSERT_PTR(data);
return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
}
#endif #endif
// read the received data // read the received data