提交 b3ba80d5 编写于 作者: L lbernstone 提交者: Me No Dev

nvs_handle is an int, was assigning NULL. Also cleaned up end to ensure no memory leak. (#3246)

上级 a5935ce1
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <esp_log.h> #include <esp_log.h>
EEPROMClass::EEPROMClass(void) EEPROMClass::EEPROMClass(void)
: _handle(NULL) : _handle(0)
, _data(0) , _data(0)
, _size(0) , _size(0)
, _dirty(false) , _dirty(false)
...@@ -40,7 +40,7 @@ EEPROMClass::EEPROMClass(void) ...@@ -40,7 +40,7 @@ EEPROMClass::EEPROMClass(void)
EEPROMClass::EEPROMClass(uint32_t sector) EEPROMClass::EEPROMClass(uint32_t sector)
// Only for compatiility, no sectors in nvs! // Only for compatiility, no sectors in nvs!
: _handle(NULL) : _handle(0)
, _data(0) , _data(0)
, _size(0) , _size(0)
, _dirty(false) , _dirty(false)
...@@ -50,7 +50,7 @@ EEPROMClass::EEPROMClass(uint32_t sector) ...@@ -50,7 +50,7 @@ EEPROMClass::EEPROMClass(uint32_t sector)
} }
EEPROMClass::EEPROMClass(const char* name, uint32_t user_defined_size) EEPROMClass::EEPROMClass(const char* name, uint32_t user_defined_size)
: _handle(NULL) : _handle(0)
, _data(0) , _data(0)
, _size(0) , _size(0)
, _dirty(false) , _dirty(false)
...@@ -60,7 +60,7 @@ EEPROMClass::EEPROMClass(const char* name, uint32_t user_defined_size) ...@@ -60,7 +60,7 @@ EEPROMClass::EEPROMClass(const char* name, uint32_t user_defined_size)
} }
EEPROMClass::~EEPROMClass() { EEPROMClass::~EEPROMClass() {
// end(); end();
} }
bool EEPROMClass::begin(size_t size) { bool EEPROMClass::begin(size_t size) {
...@@ -152,6 +152,9 @@ void EEPROMClass::end() { ...@@ -152,6 +152,9 @@ void EEPROMClass::end() {
} }
_data = 0; _data = 0;
_size = 0; _size = 0;
nvs_close(_handle);
_handle = 0;
} }
uint8_t EEPROMClass::read(int address) { uint8_t EEPROMClass::read(int address) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册