jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix faulty allocation

Browse Source
This commit is contained in:
Norbert Richter 2021-01-20 19:26:16 +01:00
parent 48ee679e45
commit e71f27c464
No known key found for this signature in database
GPG Key ID: 6628701A626FA674
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/xsns_83_neopool.ino
View File

@ -751,7 +751,7 @@ uint8_t NeoPoolWriteRegister(uint16_t addr, uint16_t *data, uint16_t cnt)
neopool_poll = false; neopool_poll = false;
numbytes = 7+cnt*2; numbytes = 7+cnt*2;
frame = (uint8_t*)malloc(numbytes); frame = (uint8_t*)malloc(numbytes+2);
if (nullptr == frame) { if (nullptr == frame) {
#ifdef DEBUG_TASMOTA_SENSOR #ifdef DEBUG_TASMOTA_SENSOR
AddLog_P(LOG_LEVEL_DEBUG, PSTR("NEO: addr 0x%04X write out of memory"), addr); AddLog_P(LOG_LEVEL_DEBUG, PSTR("NEO: addr 0x%04X write out of memory"), addr);
@ -778,10 +778,10 @@ uint8_t NeoPoolWriteRegister(uint16_t addr, uint16_t *data, uint16_t cnt)
NeoPoolModbus->flush(); NeoPoolModbus->flush();
NeoPoolModbus->write(frame, numbytes+2); NeoPoolModbus->write(frame, numbytes+2);
free(frame);
timeoutMS = millis() + 1 * NEOPOOL_READ_TIMEOUT; // Max delay before we timeout timeoutMS = millis() + 1 * NEOPOOL_READ_TIMEOUT; // Max delay before we timeout
while (!(data_ready = NeoPoolModbus->ReceiveReady()) && millis() < timeoutMS) { delay(1); } while (!(data_ready = NeoPoolModbus->ReceiveReady()) && millis() < timeoutMS) { delay(1); }
free(frame);
if (data_ready) { if (data_ready) {
uint8_t buffer[9]; uint8_t buffer[9];
uint8_t error = NeoPoolModbus->ReceiveBuffer(buffer, 1); uint8_t error = NeoPoolModbus->ReceiveBuffer(buffer, 1);
@ -799,7 +799,7 @@ uint8_t NeoPoolWriteRegister(uint16_t addr, uint16_t *data, uint16_t cnt)
} }
} }
neopool_poll = true; neopool_poll = true;
// delay(2); delay(2);
return NEOPOOL_OK; return NEOPOOL_OK;
} }
#ifdef DEBUG_TASMOTA_SENSOR #ifdef DEBUG_TASMOTA_SENSOR