Fixed Zigbee crash when removing `ZbName` (#21449)

This commit is contained in:
s-hadinger 2024-05-20 16:51:35 +02:00 committed by GitHub
parent e7f69ebc5f
commit 7253e83a04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions

View File

@ -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)

View File

@ -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