From 7253e83a041acfdb4431789a173e137a8bfcb01e Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Mon, 20 May 2024 16:51:35 +0200
Subject: [PATCH] Fixed Zigbee crash when removing `ZbName` (#21449)

---
 CHANGELOG.md                                                   | 1 +
 tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_2a_devices_impl.ino | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 542c6cf7b6f2..c213829c134f 100644
--- 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
index 549af03fcdbe..bb8d2e8acaab 100644
--- 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