ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

HeapBlockDevice: allocate with std::nothrow 

Mbed OS does not enable C++ exceptions, so we should call `new` with
`std::nothrow` which returns a C-style NULL pointer when allocation
fails to allow error handling.

For consistency of style within the same file, this commit also
replaces `malloc()` and `free()` to `new (std::nothrow)` and `delete`.
pull/14483/head
Lingkai Dong 2021-03-26 17:11:35 +00:00
parent bedd5727af
commit 7ef9e6175f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/blockdevice/source/HeapBlockDevice.cpp
View File

@ -40,7 +40,7 @@ HeapBlockDevice::~HeapBlockDevice()
{
if (_blocks) {
for (size_t i = 0; i < _count; i++) {
free(_blocks[i]);
delete[] _blocks[i];
}
delete[] _blocks;
@ -57,7 +57,11 @@ int HeapBlockDevice::init()
}
if (!_blocks) {
_blocks = new uint8_t *[_count];
_blocks = new (std::nothrow) uint8_t *[_count];
if (!_blocks) {
return BD_ERROR_DEVICE_ERROR;
}
for (size_t i = 0; i < _count; i++) {
_blocks[i] = 0;
}
@ -156,7 +160,7 @@ int HeapBlockDevice::program(const void *b, bd_addr_t addr, bd_size_t size)
bd_addr_t lo = addr % _erase_size;
if (!_blocks[hi]) {
_blocks[hi] = (uint8_t *)malloc(_erase_size);
_blocks[hi] = new (std::nothrow) uint8_t[_erase_size];
if (!_blocks[hi]) {
return BD_ERROR_DEVICE_ERROR;
}