Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/libs: uvl: fix crash when trying to validate malformed or not-existing configuration, more verbose error message for uci load failure

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-08-27 18:55:42 +00:00
parent 339042c46a
commit 8be65461bc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/uvl/luasrc/uvl.lua
View file

@ -971,7 +971,7 @@ section = luci.util.class(uvlitem)
function section.__init__(self, scheme, co, c, s)
self.cref = { c, s }
self.sref = { c, co[s] and co[s]['.type'] or s }
self.sref = { c, co and co[s] and co[s]['.type'] or s }
self.c = co
self.s = scheme
self.t = luci.uvl.TYPE_SECTION
@ -1022,7 +1022,7 @@ option = luci.util.class(uvlitem)
function option.__init__(self, scheme, co, c, s, o)
self.cref = { c, s, o }
self.sref = { c, co[s] and co[s]['.type'] or s, o }
self.sref = { c, co and co[s] and co[s]['.type'] or s, o }
self.c = co
self.s = scheme
self.t = luci.uvl.TYPE_OPTION
@ -1071,7 +1071,7 @@ enum = luci.util.class(option)
function enum.__init__(self, scheme, co, c, s, o, v)
self.cref = { c, s, o, v }
self.sref = { c, co[s] and co[s]['.type'] or s, o, v }
self.sref = { c, co and co[s] and co[s]['.type'] or s, o, v }
self.c = co
self.s = scheme
self.t = luci.uvl.TYPE_ENUM

2
libs/uvl/luasrc/uvl/errors.lua
View file

@ -18,7 +18,7 @@ module( "luci.uvl.errors", package.seeall )
require("luci.util")
ERRCODES = {
{ 'UCILOAD', 'Unable to load config "%p"' },
{ 'UCILOAD', 'Unable to load config "%p" (syntax error or file not found)' },
{ 'SCHEME', 'Error in scheme "%p":\n%c' },
{ 'CONFIG', 'Error in config "%p":\n%c' },