Skip to content

Commit 188956a

Browse files
committed
bugfix for random crash when switching between presets
this is a band-aid fix for random crashes when switching between presets with multiple segments - crossfade disabled. !! adding type initializers fixed it for me on -S3, however I still see (less frequent) crashes on esp32, due to heap corruption. It took me hours to get a meaningful stackdump: assert failed: heap_caps_free heap_caps.c:360 (heap != NULL && "free() target pointer is outside heap areas") Backtrace: 0x40084ee1:0x3ffb2570 0x4008e341:0x3ffb2590 0x40094709:0x3ffb25b0 0x4008534a:0x3ffb26e0 0x40094739:0x3ffb2700 0x400e9037:0x3ffb2720 0x400e917c:0x3ffb2740 0x400eaeeb:0x3ffb2760 0x40117ec5:0x3ffb27c0 0x401184ea:0x3ffb2800 0x4013509d:0x3ffb2820 #0 0x40084ee1:0x3ffb2570 in panic_abort at /Users/ficeto/Desktop/ESP32/ESP32S2/esp-idf-public/components/esp_system/panic.c:402 #1 0x4008e341:0x3ffb2590 in esp_system_abort at /Users/ficeto/Desktop/ESP32/ESP32S2/esp-idf-public/components/esp_system/esp_system.c:128 #2 0x40094709:0x3ffb25b0 in __assert_func at /Users/ficeto/Desktop/ESP32/ESP32S2/esp-idf-public/components/newlib/assert.c:85 #3 0x4008534a:0x3ffb26e0 in heap_caps_free at /Users/ficeto/Desktop/ESP32/ESP32S2/esp-idf-public/components/heap/heap_caps.c:360 (inlined by) heap_caps_free at /Users/ficeto/Desktop/ESP32/ESP32S2/esp-idf-public/components/heap/heap_caps.c:345 #4 0x40094739:0x3ffb2700 in free at /Users/ficeto/Desktop/ESP32/ESP32S2/esp-idf-public/components/newlib/heap.c:39 #5 0x400e9037:0x3ffb2720 in Segment::deallocateData() at wled00/FX_fcn.cpp:189 MoonModules#6 0x400e917c:0x3ffb2740 in Segment::resetIfRequired() at wled00/FX_fcn.cpp:206 (inlined by) Segment::resetIfRequired() at wled00/FX_fcn.cpp:203 MoonModules#7 0x400eaeeb:0x3ffb2760 in WS2812FX::service() at wled00/FX_fcn.cpp:1216 (discriminator 2) MoonModules#8 0x40117ec5:0x3ffb27c0 in WLED::loop() at wled00/wled.cpp:115 (discriminator 3) MoonModules#9 0x401184ea:0x3ffb2800 in loop() at C:/src/wled00/wled00.ino:20 MoonModules#10 0x4013509d:0x3ffb2820 in loopTask(void*) at C:/Users/user/.platformio/packages/framework-arduinoespressif32/cores/esp32/main.cpp:50 ELF file SHA256: 18c20b536f4c6ef4
1 parent c7dd4a7 commit 188956a

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

wled00/FX.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,10 +395,10 @@ typedef struct Segment {
395395
};
396396
uint16_t _aux0T;
397397
uint16_t _aux1T;
398-
uint32_t _stepT;
399-
uint32_t _callT;
400-
uint8_t *_dataT;
401-
uint16_t _dataLenT;
398+
uint32_t _stepT = 0;
399+
uint32_t _callT = 0;
400+
uint8_t *_dataT = nullptr;
401+
uint16_t _dataLenT = 0;
402402
} tmpsegd_t;
403403

404404
private:

wled00/FX_fcn.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ bool Segment::allocateData(size_t len) {
168168
if (data && _dataLen == len) return true; //already allocated
169169
//DEBUG_PRINTF("-- Allocating data (%d): %p\n", len, this);
170170
deallocateData();
171+
if (len == 0) return(false); // nothing to do
171172
if (Segment::getUsedSegmentData() + len > MAX_SEGMENT_DATA) {
172173
// not enough memory
173174
DEBUG_PRINTF("!!! Effect RAM depleted: %d/%d !!!\n", len, Segment::getUsedSegmentData());
@@ -184,9 +185,13 @@ bool Segment::allocateData(size_t len) {
184185
}
185186

186187
void Segment::deallocateData() {
187-
if (!data) return;
188+
if (!data) { _dataLen = 0; return; }
188189
//DEBUG_PRINTF("--- Released data (%p): %d/%d -> %p\n", this, _dataLen, Segment::getUsedSegmentData(), data);
189-
free(data);
190+
if ((Segment::getUsedSegmentData() > 0) && (_dataLen > 0)) { // check that we don't have a dangling / inconsistent data pointer
191+
free(data);
192+
} else {
193+
DEBUG_PRINTF("---- Released data (%p): inconsistent UsedSegmentData (%d/%d), cowardly refusing to free nothing.\n", this, _dataLen, Segment::getUsedSegmentData());
194+
}
190195
data = nullptr;
191196
// WARNING it looks like we have a memory leak somewhere
192197
Segment::addUsedSegmentData(_dataLen <= Segment::getUsedSegmentData() ? -_dataLen : -Segment::getUsedSegmentData());
@@ -338,6 +343,7 @@ void Segment::stopTransition() {
338343
//DEBUG_PRINTF("-- Released duplicate data (%d): %p\n", _t->_segT._dataLenT, _t->_segT._dataT);
339344
free(_t->_segT._dataT);
340345
_t->_segT._dataT = nullptr;
346+
_t->_segT._dataLenT = 0;
341347
}
342348
#endif
343349
delete _t;
@@ -364,6 +370,7 @@ uint16_t Segment::progress() {
364370
void Segment::swapSegenv(tmpsegd_t &tmpSeg) {
365371
if (!_t) return;
366372
//DEBUG_PRINTF("-- Saving temp seg: %p (%p)\n", this, tmpSeg);
373+
if (nullptr == &tmpSeg) { DEBUG_PRINTLN(F("swapSegenv(): tmpSeg is nullptr !!")); return; } // sanity check
367374
tmpSeg._optionsT = options;
368375
for (size_t i=0; i<NUM_COLORS; i++) tmpSeg._colorT[i] = colors[i];
369376
tmpSeg._speedT = speed;
@@ -404,6 +411,7 @@ void Segment::swapSegenv(tmpsegd_t &tmpSeg) {
404411

405412
void Segment::restoreSegenv(tmpsegd_t &tmpSeg) {
406413
//DEBUG_PRINTF("-- Restoring temp seg: %p (%p)\n", this, tmpSeg);
414+
if (nullptr == &tmpSeg) {DEBUG_PRINTLN(F("restoreSegenv(): tmpSeg is nullptr !!")); return;} // sanity check
407415
if (_t && &(_t->_segT) != &tmpSeg) {
408416
// update possibly changed variables to keep old effect running correctly
409417
_t->_segT._aux0T = aux0;

0 commit comments

Comments
 (0)