From 672f680f96cd4c5886c49cb3c6b26131cb47c7fd Mon Sep 17 00:00:00 2001 From: Larry Bernstone Date: Sun, 22 Sep 2019 12:31:12 -0600 Subject: [PATCH] nvs_handle is an int, was assigning NULL. Also cleaned up end to ensure no memory leak. --- libraries/EEPROM/src/EEPROM.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libraries/EEPROM/src/EEPROM.cpp b/libraries/EEPROM/src/EEPROM.cpp index 1bec6127d2c..7f4ab090f1f 100644 --- a/libraries/EEPROM/src/EEPROM.cpp +++ b/libraries/EEPROM/src/EEPROM.cpp @@ -29,7 +29,7 @@ #include EEPROMClass::EEPROMClass(void) - : _handle(NULL) + : _handle(0) , _data(0) , _size(0) , _dirty(false) @@ -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) @@ -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) @@ -60,7 +60,7 @@ EEPROMClass::EEPROMClass(const char* name, uint32_t user_defined_size) } EEPROMClass::~EEPROMClass() { - // end(); + end(); } bool EEPROMClass::begin(size_t size) { @@ -152,6 +152,9 @@ void EEPROMClass::end() { } _data = 0; _size = 0; + + nvs_close(_handle); + _handle = 0; } uint8_t EEPROMClass::read(int address) {