Skip to content

Updater: fall back to a 256 byte buffer when the sector buffer cannot be allocated #9344

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
sanerdemirel wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Updater: fall back to a 256 byte buffer when the sector buffer cannot be allocated #9344

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0ad88d
host tests: let a test set the mocked free heap
sanerdemirel Nov 9, 2026
0416e07
Updater: host tests for the buffer size choice and the fallback
sanerdemirel Nov 9, 2026
f005cb9
Updater: try the sector buffer, then 256 bytes, instead of one alloca…
sanerdemirel Nov 9, 2026
d2fc6d5
Updater host tests: skip under valgrind, free every buffer
sanerdemirel Nov 9, 2026
3ae4cdd
Updater host tests: clang-format
sanerdemirel Nov 9, 2026
312b717
Updater host tests: drop the operator new[] hook tests
sanerdemirel Nov 10, 2026
433d787
Merge branch 'master' into updater-buffer-fallback
mcspr Nov 14, 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
12 changes: 7 additions & 5 deletions cores/esp8266/Updater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,14 @@ bool UpdaterClass::begin(size_t size, int command, int ledPin, uint8_t ledOn) {
_startAddress = updateStartAddress;
_currentAddress = _startAddress;
_size = size;
if (ESP.getFreeHeap() > 2 * FLASH_SECTOR_SIZE) {
_bufferSize = FLASH_SECTOR_SIZE;
} else {
_bufferSize = 256;
// Try the big buffer first, then the small one. The big one is skipped
// when free heap is low, and it can also fail on a fragmented heap.
static constexpr size_t bufferSizes[] { FLASH_SECTOR_SIZE, 256 };
size_t first = (ESP.getFreeHeap() > 2 * FLASH_SECTOR_SIZE) ? 0 : 1;
for (size_t i = first; !_buffer && i < sizeof(bufferSizes) / sizeof(bufferSizes[0]); ++i) {
_bufferSize = bufferSizes[i];
_buffer = new (std::nothrow) uint8_t[_bufferSize];
}
_buffer = new (std::nothrow) uint8_t[_bufferSize];
if (!_buffer) {
_setError(UPDATE_ERROR_OOM);
_reset(false);
Expand Down