Skip to content

Patch rollover-unsafe millis() deadline checks in RF24Network.cpp #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TMRh20 merged 2 commits into from
Jun 6, 2026
Merged

Patch rollover-unsafe millis() deadline checks in RF24Network.cpp #270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
128c8b0
Initial plan
Copilot Jun 4, 2026
b670045
Patch millis timeout checks for rollover safety
Copilot Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions RF24Network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ uint8_t ESBNetwork<radio_t>::update(void)

uint8_t returnVal = 0;

uint32_t timeout = millis() + 100;
const uint32_t timeout_start = millis();

while (radio.available()) {
if (millis() > timeout) {
if (millis() - timeout_start > 100) {
return NETWORK_OVERRUN;
}
#if defined(ENABLE_DYNAMIC_PAYLOADS) && !defined(XMEGA_D3)
Expand Down Expand Up @@ -786,8 +786,8 @@ bool ESBNetwork<radio_t>::main_write(RF24NetworkHeader& header, const void* mess
ok = _write(header, ((char*)message) + offset, fragmentLen, writeDirect);

if (!ok) {
uint32_t timer = millis() + 2;
while (millis() < timer) {
const uint32_t retry_delay_start = millis();
while (millis() - retry_delay_start < 2) {
}
++retriesPerFrag;
}
Expand Down