Software /
code /
prosody
Diff
util/json.lua @ 6054:7a5ddbaf758d
Merge 0.9->0.10
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Wed, 02 Apr 2014 17:41:38 +0100 |
parent | 5776:bd0ff8ae98a8 |
child | 6785:bf1f09a5bcf7 |
line wrap: on
line diff
--- a/util/json.lua Wed Apr 02 14:31:19 2014 +0100 +++ b/util/json.lua Wed Apr 02 17:41:38 2014 +0100 @@ -348,9 +348,9 @@ function json.decode(json) json = json:gsub("\\.", first_escape) -- get rid of all escapes except \uXXXX, making string parsing much simpler --:gsub("[\r\n]", "\t"); -- \r\n\t are equivalent, we care about none of them, and none of them can be in strings - + -- TODO do encoding verification - + local val, index = _readvalue(json, 1); if val == nil then return val, index; end if json:find("[^ \t\r\n]", index) then return nil, "garbage at eof"; end