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

[LoRaWAN] Fix possible integer overflow

Browse source
This commit is contained in:
jgromes 2024-01-14 16:33:17 +01:00
parent e392c7b91f
commit be52cd8edd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1898,7 +1898,7 @@ uint32_t LoRaWANNode::dutyCycleInterval(uint32_t msPerHour, uint32_t airtime) {
if(msPerHour == 0 || airtime == 0) { if(msPerHour == 0 || airtime == 0) {
return(0); return(0);
} }
uint32_t oneHourInMs = 60 * 60 * 1000; uint32_t oneHourInMs = (uint32_t)60 * (uint32_t)60 * (uint32_t)1000;
float numPackets = msPerHour / airtime; float numPackets = msPerHour / airtime;
uint32_t delayMs = oneHourInMs / numPackets + 1; // + 1 to prevent rounding problems uint32_t delayMs = oneHourInMs / numPackets + 1; // + 1 to prevent rounding problems
return(delayMs); return(delayMs);
@ -2244,7 +2244,7 @@ bool LoRaWANNode::execMacCommand(LoRaWANMacCommand_t* cmd, bool saveToEeprom) {
if(maxDutyCycle == 0) { if(maxDutyCycle == 0) {
this->dutyCycle = this->band->dutyCycle; this->dutyCycle = this->band->dutyCycle;
} else { } else {
this->dutyCycle = 60 * 60 * 1000 / (1 << maxDutyCycle); this->dutyCycle = (uint32_t)60 * (uint32_t)60 * (uint32_t)1000 / (uint32_t)(1UL << maxDutyCycle);
} }
#if !defined(RADIOLIB_EEPROM_UNSUPPORTED) #if !defined(RADIOLIB_EEPROM_UNSUPPORTED)