From a4ce4830e867580097f672b8fbffbdc2728213fe Mon Sep 17 00:00:00 2001
From: Matthijs Abma <4146168+abmaonline@users.noreply.github.com>
Date: Sat, 23 May 2020 17:34:59 +0200
Subject: [PATCH] Encode content when not raw or json

---
 tasmota/support_tasmota.ino       | 6 +++++-
 tasmota/xdrv_08_serial_bridge.ino | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 671b4ad9d..6ccd057da 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -1349,7 +1349,11 @@ void SerialInput(void)
     bool assume_json = (!Settings.flag.mqtt_serial_raw && (serial_in_buffer[0] == '{'));
     Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":%s%s%s}"),
       (assume_json) ? "" : "\"",
-      (Settings.flag.mqtt_serial_raw) ? ToHex_P((unsigned char*)serial_in_buffer, serial_in_byte_counter, hex_char, sizeof(hex_char)) : serial_in_buffer,
+      (Settings.flag.mqtt_serial_raw) 
+        ? ToHex_P((unsigned char*)serial_in_buffer, serial_in_byte_counter, hex_char, sizeof(hex_char)) 
+        : (assume_json) 
+            ? serial_in_buffer 
+            : EscapeJSONString(serial_in_buffer).c_str(),
       (assume_json) ? "" : "\"");
     MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED));
     XdrvRulesProcess();
diff --git a/tasmota/xdrv_08_serial_bridge.ino b/tasmota/xdrv_08_serial_bridge.ino
index a713b5cfb..7aa6397dd 100644
--- a/tasmota/xdrv_08_serial_bridge.ino
+++ b/tasmota/xdrv_08_serial_bridge.ino
@@ -80,7 +80,11 @@ void SerialBridgeInput(void)
     bool assume_json = (!serial_bridge_raw && (serial_bridge_buffer[0] == '{'));
     Response_P(PSTR("{\"" D_JSON_SSERIALRECEIVED "\":%s%s%s}"),
       (assume_json) ? "" : "\"",
-      (serial_bridge_raw) ? ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)) : serial_bridge_buffer,
+      (serial_bridge_raw) 
+        ? ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)) 
+        : (assume_json) 
+            ? serial_bridge_buffer 
+            : EscapeJSONString(serial_bridge_buffer).c_str(),
       (assume_json) ? "" : "\"");
     MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SSERIALRECEIVED));
     XdrvRulesProcess();