summaryrefslogtreecommitdiffhomepage
path: root/libs/web/luasrc
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-11-21 16:04:13 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-11-21 16:04:13 +0000
commit2675ad1c63604018d72c8f3d4fff3f28f6f5b52c (patch)
tree43b457ad4970129bd946729a1e1dccb000f1f1cd /libs/web/luasrc
parentc9556c02bb49d5eee903ade2e73ea586ee09afde (diff)
libs/web: fix luci.http.write_json() to properly encode control chars in strings
Diffstat (limited to 'libs/web/luasrc')
-rw-r--r--libs/web/luasrc/http.lua9
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/web/luasrc/http.lua b/libs/web/luasrc/http.lua
index 18112507ce..c53307a5a1 100644
--- a/libs/web/luasrc/http.lua
+++ b/libs/web/luasrc/http.lua
@@ -4,9 +4,6 @@ LuCI - HTTP-Interaction
Description:
HTTP-Header manipulator and form variable preprocessor
-FileId:
-$Id$
-
License:
Copyright 2008 Steven Barth <steven@midlink.org>
@@ -334,12 +331,14 @@ function write_json(x)
end
elseif type(x) == "number" or type(x) == "boolean" then
if (x ~= x) then
- -- NaN is the only value that doesn't equal to itself.
+ -- NaN is the only value that doesn't equal to itself.
write("Number.NaN")
else
write(tostring(x))
end
else
- write("%q" % tostring(x))
+ write('"%s"' % tostring(x):gsub('["%z\1-\31]', function(c)
+ return '\\u%04x' % c:byte(1)
+ end))
end
end