Merge pull request #502 from bdring/Devt

Devt
bdring · Jun 21, 2022 · d7189a0 · d7189a0
2 parents 59aed88 + 141814f
commit d7189a0
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/FluidNC/src/ProcessSettings.cpp b/FluidNC/src/ProcessSettings.cpp
@@ -890,7 +890,7 @@ Error settings_execute_line(char* line, Channel& out, WebUI::AuthenticationLevel
 
     char* value;
     if (*line++ == '[') {  // [ESPxxx] form
-        value = strrchr(line, ']');
+        value = strchr(line, ']');
         if (!value) {
             // Missing ] is an error in this form
             return Error::InvalidStatement;

diff --git a/FluidNC/src/Report.cpp b/FluidNC/src/Report.cpp
@@ -174,11 +174,15 @@ void report_feedback_message(Message message) {  // ok to send to all channels
 
 const char* radio =
 #if defined(ENABLE_WIFI) || defined(ENABLE_BLUETOOTH)
-#    ifdef ENABLE_WIFI
+#    if defined(ENABLE_WIFI) && defined(ENABLE_BLUETOOTH)
+    "wifi+bt";
+#    else
+#        ifdef ENABLE_WIFI
     "wifi";
-#    endif
-#    ifdef ENABLE_BLUETOOTH
+#        endif
+#        ifdef ENABLE_BLUETOOTH
 "bt";
+#        endif
 #    endif
 #else
     "noradio";

diff --git a/FluidNC/src/WebUI/JSONEncoder.cpp b/FluidNC/src/WebUI/JSONEncoder.cpp
@@ -43,7 +43,36 @@ namespace WebUI {
     // Private function to add a name enclosed with quotes.
     void JSONencoder::quoted(const char* s) {
         add('"');
-        stream << s;
+        char c;
+        while ((c = *s++) != '\0') {
+            // Escape JSON special characters
+            switch (c) {
+                case '\b':
+                    stream << "\\b";
+                    break;
+                case '\n':
+                    stream << "\\n";
+                    break;
+                case '\f':
+                    stream << "\\f";
+                    break;
+                case '\r':
+                    stream << "\\r";
+                    break;
+                case '\t':
+                    stream << "\\t";
+                    break;
+                case '"':
+                    stream << "\\\"";
+                    break;
+                case '\\':
+                    stream << "\\\\";
+                    break;
+                default:
+                    stream << c;
+                    break;
+            }
+        }
         add('"');
     }