Skip to content

Commit

Permalink
nvs_handle is an int, was assigning NULL. Also cleaned up end to ensu…
Browse files Browse the repository at this point in the history
…re no memory leak. (espressif#3246)
  • Loading branch information
lbernstone authored and me-no-dev committed Sep 22, 2019
1 parent a5935ce commit b3ba80d
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions libraries/EEPROM/src/EEPROM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <esp_log.h>

EEPROMClass::EEPROMClass(void)
: _handle(NULL)
: _handle(0)
, _data(0)
, _size(0)
, _dirty(false)
Expand All @@ -40,7 +40,7 @@ EEPROMClass::EEPROMClass(void)

EEPROMClass::EEPROMClass(uint32_t sector)
// Only for compatiility, no sectors in nvs!
: _handle(NULL)
: _handle(0)
, _data(0)
, _size(0)
, _dirty(false)
Expand All @@ -50,7 +50,7 @@ EEPROMClass::EEPROMClass(uint32_t sector)
}

EEPROMClass::EEPROMClass(const char* name, uint32_t user_defined_size)
: _handle(NULL)
: _handle(0)
, _data(0)
, _size(0)
, _dirty(false)
Expand All @@ -60,7 +60,7 @@ EEPROMClass::EEPROMClass(const char* name, uint32_t user_defined_size)
}

EEPROMClass::~EEPROMClass() {
// end();
end();
}

bool EEPROMClass::begin(size_t size) {
Expand Down Expand Up @@ -152,6 +152,9 @@ void EEPROMClass::end() {
}
_data = 0;
_size = 0;

nvs_close(_handle);
_handle = 0;
}

uint8_t EEPROMClass::read(int address) {
Expand Down

0 comments on commit b3ba80d

Please sign in to comment.