From eb6e343c53d25b24bfe0e05ecbb1d29297dfcb6d Mon Sep 17 00:00:00 2001
From: rxi <rxi@users.noreply.github.com>
Date: Sat, 10 Mar 2018 14:28:50 +0000
Subject: [PATCH] Added checking and tests for trailing garbage when decoding

---
 json.lua      | 7 ++++++-
 test/test.lua | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/json.lua b/json.lua
index de7bfb5..9612e7d 100644
--- a/json.lua
+++ b/json.lua
@@ -388,7 +388,12 @@ function json.decode(str)
   if type(str) ~= "string" then
     error("expected argument of type string, got " .. type(str))
   end
-  return ( parse(str, next_char(str, 1, space_chars, true)) )
+  local res, idx = parse(str, next_char(str, 1, space_chars, true))
+  idx = next_char(str, idx, space_chars, true)
+  if idx <= #str then
+    decode_error(str, idx, "trailing garbage")
+  end
+  return res
 end
 
 
diff --git a/test/test.lua b/test/test.lua
index 88138d0..734982a 100644
--- a/test/test.lua
+++ b/test/test.lua
@@ -57,7 +57,7 @@ end)
 
 test("literals", function()
   assert( json.decode("true") == true )
-  assert( json.encode(true) == "true" ) 
+  assert( json.encode(true) == "true" )
   assert( json.decode("false") == false )
   assert( json.encode(false) == "false" )
   assert( json.decode("null") == nil )
@@ -125,6 +125,8 @@ test("decode invalid", function()
     '{]',
     '[}',
     '"a',
+    '10 xx',
+    '{}123'
   }
   for i, v in ipairs(t) do
     local status = pcall(json.decode, v)
@@ -234,5 +236,3 @@ test("encode escape", function()
     assert( res == v, fmt("'%s' was not escaped properly", k) )
   end
 end)
-
-