Fixed parse_string() to handle "\\" correctly, added tests

float69 · Aug 19, 2015 · 7f823ab · 7f823ab
1 parent 50f4512
commit 7f823ab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/json.lua b/json.lua
@@ -214,11 +214,12 @@ local function parse_string(str, i, chr)
           has_unicode_escape = true
         end
       else
+        if not escape_chars[x] then
+          decode_error(str, j, "invalid escape char '" .. x .. "' in string")
+        end
         has_escape = true
       end
-      if not escape_chars[x] then
-        decode_error(str, j, "invalid escape char '" .. x .. "' in string")
-      end
+      last = nil
 
     elseif x == '"' then
       local s = str:sub(i + 1, j - 1)
@@ -232,8 +233,10 @@ local function parse_string(str, i, chr)
         s = s:gsub("\\.", escape_char_map_inv)
       end
       return s, j + 1
+
+    else
+      last = x
     end
-    last = x
   end
   decode_error(str, i, "expected closing quote for string")
 end

diff --git a/test/test.lua b/test/test.lua
@@ -152,6 +152,8 @@ test("decode escape", function()
     [ [["\u263a"]]        ] = '☺',
     [ [["\ud83d\ude02"]]  ] = '😂',
     [ [["\r\n\t\\\""]]    ] = '\r\n\t\\"',
+    [ [["\\"]]            ] = '\\',
+    [ [["\\\\"]]          ] = '\\\\',
   }
   for k, v in pairs(t) do
     local res = json.decode(k)