fix escape char logic in json parser

ethereum · Jun 14, 2024 · 006f498 · 006f498
1 parent 16f5825
commit 006f498
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/libdataobj/DataObject.cpp b/libdataobj/DataObject.cpp
@@ -576,6 +576,7 @@ std::string DataObject::asJson(int level, bool pretty, bool nokey) const
         out << "]";
         break;
     case DataType::String:
+    {
         printLevel();
         if (!m_strKey.empty() && !nokey)
         {
@@ -586,22 +587,25 @@ std::string DataObject::asJson(int level, bool pretty, bool nokey) const
         }
 
         //  threat special chars
+        char ch_before = 0;
         for (auto const& ch: asString())
         {
             if (ch == 10)
                 buffer += "\\n";
             else if (ch == 9)
                 buffer += "\\t";
-            else if (ch == '"')
+            else if (ch == '"' && ch_before != '\\')
             {
                 buffer += "\\";
                 buffer += "\"";
             }
             else
                 buffer += ch;
+            ch_before = ch;
         }
         out << "\"" << buffer << "\"";
         break;
+    }
     case DataType::Double:
         printLevel();
         if (!m_strKey.empty() && !nokey)

diff --git a/libdataobj/JsonParser.cpp b/libdataobj/JsonParser.cpp
@@ -66,10 +66,18 @@ void JsonParser::checkJsonCommaEnding(size_t& _i) const
             + "around: " + printDebug(_i);
 }
 
+bool JsonParser::isEscapeChar(size_t _i) const
+{
+    if (_i < 1)
+        return m_input.at(_i) == '\\';
+    if (m_input.at(_i) == '\\' && m_input.at(_i - 1) != '\\')
+        return true;
+    return false;
+}
+
 JsonParser::RET JsonParser::tryParseKeyValue(size_t& _i)
 {
-    const bool escapeChar = (_i > 0 && m_input.at(_i - 1) == '\\');
-    if (m_input.at(_i) == '"' && !escapeChar)
+    if (m_input.at(_i) == '"' && _i > 0 && !isEscapeChar(_i - 1))
     {
         spDataObject obj;
         string key = parseKeyValue(_i);
@@ -286,7 +294,7 @@ string JsonParser::parseKeyValue(size_t& _i) const
     {
         while (escapeChar)
         {
-            escapeChar = (m_input[endPos - 1] == '\\');
+            escapeChar = isEscapeChar(endPos - 1);
             if (escapeChar)
                 endPos = m_input.find('"', endPos + 1);
         }

diff --git a/libdataobj/JsonParser.h b/libdataobj/JsonParser.h
@@ -33,6 +33,7 @@ class JsonParser
     size_t skipSpaces(size_t const& _i) const;
     std::string parseKeyValue(size_t& _i) const;
     bool readBoolOrNull(size_t& _i, bool& _result, bool& _readNull) const;
+    bool isEscapeChar(size_t _i) const;
 
     enum class ReadDigitType
     {