aboutsummaryrefslogtreecommitdiffstats
path: root/util/json.lua
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-06-02 05:36:15 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-06-02 05:36:15 +0500
commite1ba26dafecb85a73a0856ff001594acb25c4db4 (patch)
treee069a72bf41c37453f81144696ad194e7d016368 /util/json.lua
parent0ffdcd1dd76f1fb6e8e9d2cc3540e5b472dc6e60 (diff)
downloadprosody-e1ba26dafecb85a73a0856ff001594acb25c4db4.tar.gz
prosody-e1ba26dafecb85a73a0856ff001594acb25c4db4.zip
util.json: Fixed handling of truncated JSON.
Diffstat (limited to 'util/json.lua')
-rw-r--r--util/json.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/util/json.lua b/util/json.lua
index 05453703..cfa84a4b 100644
--- a/util/json.lua
+++ b/util/json.lua
@@ -134,12 +134,14 @@ end
function json.decode(json)
+ json = json.." "; -- appending a space ensures valid json wouldn't touch EOF
local pos = 1;
local current = {};
local stack = {};
local ch, peek;
local function next()
ch = json:sub(pos, pos);
+ if ch == "" then error("Unexpected EOF"); end
pos = pos+1;
peek = json:sub(pos, pos);
return ch;