Fix watchdog restart or freeze if displaytext is more than 128 ch…

…aracters (#21401)
arendst · May 17, 2024 · 2ddbc7c · 2ddbc7c
1 parent b9bd558
commit 2ddbc7c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ## [14.0.0.1]
 ### Added
-- Enabled watchdog for ESP32 and variants
+- Enabled watchdog for ESP32 and variants (#21422)
 
 ### Breaking Changed
 
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 - Domoticz re-subscribe on MQTT reconnect. Regression from v13.4.0.3 (#21281)
+- Watchdog restart or freeze if ``displaytext`` is more than 128 characters (#21401)
 
 ### Removed
 - Support of old insecure fingerprint algorithm. Deprecated since v8.4.0 (#21417)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -121,6 +121,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 
 ## Changelog v14.0.0.1
 ### Added
+- Enabled watchdog for ESP32 and variants [#21422](https://github.com/arendst/Tasmota/issues/21422)
 
 ### Breaking Changed
 
@@ -129,6 +130,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 
 ### Fixed
 - Domoticz re-subscribe on MQTT reconnect. Regression from v13.4.0.3 [#21281](https://github.com/arendst/Tasmota/issues/21281)
+- Watchdog restart or freeze if ``displaytext`` is more than 128 characters (#21401)[#21401](https://github.com/arendst/Tasmota/issues/21401)
 
 ### Removed
 - Support of old insecure fingerprint algorithm. Deprecated since v8.4.0 [#21417](https://github.com/arendst/Tasmota/issues/21417)
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino b/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino
@@ -497,7 +497,11 @@ void DisplayText(void)
  }
  } else {
  // copy chars
- if (dp < (linebuf + DISPLAY_BUFFER_COLS)) { *dp++ = *cp++; }
+ if (dp < (linebuf + DISPLAY_BUFFER_COLS)) {
+ *dp++ = *cp++;
+ } else {
+ break;
+ }
  }
  } else {
  // check escapes