Skip to content

Fix of memory leak happening on realloc fails #423

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

Closed
Amphyby wants to merge 1 commit into from
Closed

Fix of memory leak happening on realloc fails #423

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 25 additions & 17 deletions src/remote/BLERemoteCharacteristic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,12 @@ int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length, bool
length = maxLength;
}

_value = (uint8_t*)realloc(_value, length);
if (_value == NULL) {
// realloc failed
uint8_t* newValue = (uint8_t*)realloc(_value, length);
if (newValue == NULL) {
// realloc failed - keep old buffer to avoid memory leak
return 0;
}
_value = newValue;

if ((_properties & BLEWrite) && withResponse) {
uint8_t resp[4];
Expand Down Expand Up @@ -180,14 +181,16 @@ bool BLERemoteCharacteristic::read()
return false;
}

_valueLength = respLength - 1;
_value = (uint8_t*)realloc(_value, _valueLength);
int newLength = respLength - 1;
uint8_t* newValue = (uint8_t*)realloc(_value, newLength);

if (_value == NULL) {
_valueLength = 0;
if (newValue == NULL) {
// realloc failed - keep old buffer to avoid memory leak
return false;
}

_value = newValue;
_valueLength = newLength;
memcpy(_value, &resp[1], _valueLength);

return true;
Expand Down Expand Up @@ -246,18 +249,23 @@ void BLERemoteCharacteristic::addDescriptor(BLERemoteDescriptor* descriptor)

void BLERemoteCharacteristic::writeValue(BLEDevice device, const uint8_t value[], int length)
{
_valueLength = length;
_value = (uint8_t*)realloc(_value, _valueLength);

if (_value == NULL) {
_valueLength = 0;
return;
uint8_t* newValue = (uint8_t*)realloc(_value, length);

if (newValue == NULL) {
// realloc failed, but still signal that an update occurred
// so the user knows data arrived (even though we couldn't store it)
_valueUpdated = true;
_updatedValueRead = false;
// keep old _value and _valueLength intact to avoid memory leak
// and preserve previous data
} else {
_value = newValue;
_valueLength = length;
_valueUpdated = true;
_updatedValueRead = false;
memcpy(_value, value, _valueLength);
}

_valueUpdated = true;
_updatedValueRead = false;
memcpy(_value, value, _valueLength);

if (_valueUpdatedEventHandler) {
_valueUpdatedEventHandler(device, BLECharacteristic(this));
}
Expand Down
Loading