Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure we never pass 'nil' to the json parser (#685)

This commit is contained in:
Tim Wilkinson 2023-01-28 19:58:46 -08:00 committed by GitHub
parent 574446d68e
commit f733592438
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/www/cgi-bin/admin
View File

@ -317,7 +317,7 @@ if parms.button_refresh_fw then
for ver, data in pairs(firmware_versions) for ver, data in pairs(firmware_versions)
do do
local raw = io.popen(wget .. " -O - " .. config_serverpath .. data .. "/overview.json 2> /dev/null") local raw = io.popen(wget .. " -O - " .. config_serverpath .. data .. "/overview.json 2> /dev/null")
local info = luci.jsonc.parse(raw:read("*a")) local info = luci.jsonc.parse(raw:read("*a") or "")
raw:close() raw:close()
firmware_versions[ver] = nil firmware_versions[ver] = nil
if info then if info then
@ -357,7 +357,7 @@ if nixio.fs.stat("/etc/mesh-release") then
end end
local f = io.open("/tmp/web/firmware.list") local f = io.open("/tmp/web/firmware.list")
if f then if f then
fw_versions = luci.jsonc.parse(f:read("*a")) fw_versions = luci.jsonc.parse(f:read("*a") or "")
f:close() f:close()
if fw_versions then if fw_versions then
for v, d in pairs(fw_versions) for v, d in pairs(fw_versions)
@ -440,7 +440,7 @@ if parms.button_dl_fw and parms.dl_fw ~= "default" then
local err local err
local f = io.popen(wget .. " -O - " .. fw_versions[parms.dl_fw].overview .. " 2> /dev/null") local f = io.popen(wget .. " -O - " .. fw_versions[parms.dl_fw].overview .. " 2> /dev/null")
local fwinfo = luci.jsonc.parse(f:read("*a")) local fwinfo = luci.jsonc.parse(f:read("*a") or "")
f:close() f:close()
if fwinfo then if fwinfo then