Skip to content

Fix/serialble overflow guard #872

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix/serialble overflow guard #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ee0b85
Fix debug log: use c->extra.room.push_failures instead of non-existen…
Oct 1, 2025
5103422
fix(nrf52-ble): bound readBytes in checkRecvFrame() to MAX_FRAME_SIZE
Oct 1, 2025
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
2 changes: 1 addition & 1 deletion examples/simple_room_server/MyMesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ void MyMesh::loop() {
if (c->extra.room.pending_ack && millisHasNowPassed(c->extra.room.ack_timeout)) {
c->extra.room.push_failures++;
c->extra.room.pending_ack = 0; // reset (TODO: keep prev expected_ack's in a list, incase they arrive LATER, after we retry)
MESH_DEBUG_PRINTLN("pending ACK timed out: push_failures: %d", (uint32_t)c->push_failures);
MESH_DEBUG_PRINTLN("pending ACK timed out: push_failures: %d", (uint32_t)c->extra.room.push_failures);
}
}
// check next Round-Robin client, and sync next new post
Expand Down
28 changes: 23 additions & 5 deletions src/helpers/nrf52/SerialBLEInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,29 @@ size_t SerialBLEInterface::checkRecvFrame(uint8_t dest[]) {
send_queue[i] = send_queue[i + 1];
}
} else {
int len = bleuart.available();
if (len > 0) {
bleuart.readBytes(dest, len);
BLE_DEBUG_PRINTLN("readBytes: sz=%d, hdr=%d", len, (uint32_t) dest[0]);
return len;
int avail = bleuart.available();
if (avail > 0) {
// Cap read to avoid overflowing caller's buffer (MAX_FRAME_SIZE)
int to_read = avail > MAX_FRAME_SIZE ? MAX_FRAME_SIZE : avail;
int got = bleuart.readBytes(dest, to_read);

// If more data is pending than we can safely store, drain the excess
if (avail > MAX_FRAME_SIZE) {
int remaining = avail - to_read;
uint8_t discard[32];
int drained_total = 0;
while (remaining > 0) {
int chunk = remaining > (int)sizeof(discard) ? (int)sizeof(discard) : remaining;
int drained = bleuart.readBytes(discard, chunk);
if (drained <= 0) break;
drained_total += drained;
remaining -= drained;
}
BLE_DEBUG_PRINTLN("WARN: BLE RX overflow: avail=%d, read=%d, drained=%d", avail, got, drained_total);
}

BLE_DEBUG_PRINTLN("readBytes: sz=%d, hdr=%d", got, (uint32_t) dest[0]);
return got;
}
}
return 0;
Expand Down