Skip to content

Fix memory leak and undefined behavour in Updater.cpp (UpdaterClass) #8671

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
merged 4 commits into from
Oct 6, 2023
Merged

Fix memory leak and undefined behavour in Updater.cpp (UpdaterClass) #8671

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
335a6f7
Fix memory leak and undefined behavour in Updater #7984
MathewHDYT Sep 25, 2023
14e7e6e
Update error message
MathewHDYT Oct 4, 2023
6e65d23
Update error message
MathewHDYT Oct 4, 2023
a76468a
Merge branch 'master' into master
me-no-dev Oct 5, 2023
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
20 changes: 13 additions & 7 deletions libraries/Update/src/Updater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,15 @@ UpdateClass& UpdateClass::onProgress(THandlerFunction_Progress fn) {
}

void UpdateClass::_reset() {
if (_buffer)
if (_buffer) {
delete[] _buffer;
_buffer = 0;
}
if (_skipBuffer) {
delete[] _skipBuffer;
}

_buffer = nullptr;
_skipBuffer = nullptr;
_bufferLen = 0;
_progress = 0;
_size = 0;
Expand Down Expand Up @@ -159,8 +165,8 @@ bool UpdateClass::begin(size_t size, int command, int ledPin, uint8_t ledOn, con
}

//initialize
_buffer = (uint8_t*)malloc(SPI_FLASH_SEC_SIZE);
if(!_buffer){
_buffer = new (std::nothrow) uint8_t[SPI_FLASH_SEC_SIZE];
if (!_buffer) {
log_e("malloc failed");
return false;
}
Expand Down Expand Up @@ -193,10 +199,10 @@ bool UpdateClass::_writeBuffer(){
//not written at this point so that partially written firmware
//will not be bootable
skip = ENCRYPTED_BLOCK_SIZE;
_skipBuffer = (uint8_t*)malloc(skip);
if(!_skipBuffer){
_skipBuffer = new (std::nothrow) uint8_t[skip];
if (!_skipBuffer) {
log_e("malloc failed");
return false;
return false;
}
memcpy(_skipBuffer, _buffer, skip);
}
Expand Down