Fixed Zigbee crash when removing ZbName (arendst#21449)

s-hadinger · web-flow · commit 7253e83a041a · 2024-05-20T16:51:35.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file.
 - Avoid connection errors when switching to safeboot to upload OTA firmware (#21428)
 - Berry Leds matrix alternate more and error about 'bri' attribute (#21431)
 - Wrong timeout in `WebQuery` and `webclient` since Core3
+- Zigbee crash when removing `ZbName`
 
 ### Removed
 - Support of old insecure fingerprint algorithm. Deprecated since v8.4.0 (#21417)
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_2a_devices_impl.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_2a_devices_impl.ino
@@ -323,7 +323,7 @@ bool Z_Device::setEPName(uint8_t ep, const char * name) {
 }
 
 void Z_Device::setStringAttribute(char*& attr, const char * str) {
-  if (nullptr == str)  { str = PSTR(""); }    // nullptr is considered empty string
+  if (nullptr == str)  { str = ""; }    // nullptr is considered empty string, don't use PROGMEM to avoid crash
   size_t str_len = strlen(str);
 
   if ((nullptr == attr) && (0 == str_len)) { return; } // if both empty, don't do anything

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ bool Z_Device::setEPName(uint8_t ep, const char * name) {`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`void Z_Device::setStringAttribute(char& attr, const char str) {`
`326`		`- if (nullptr == str) { str = PSTR(""); } // nullptr is considered empty string`
	`326`	`+ if (nullptr == str) { str = ""; } // nullptr is considered empty string, don't use PROGMEM to avoid crash`
`327`	`327`	`size_t str_len = strlen(str);`
`328`	`328`
`329`	`329`	`if ((nullptr == attr) && (0 == str_len)) { return; } // if both empty, don't do anything`