* luci/libs: uvl: fix crash when trying to validate malformed or not-existing configu...

diff --git a/libs/uvl/luasrc/uvl.lua b/libs/uvl/luasrc/uvl.lua
index 5cad3d20e2c953644d39ebd95799acb2391ff804..24dc3a25d2996d0e7aff470d4846526d15ebbd8f 100644 (file)
--- a/libs/uvl/luasrc/uvl.lua
+++ b/libs/uvl/luasrc/uvl.lua
@@ -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

diff --git a/libs/uvl/luasrc/uvl/errors.lua b/libs/uvl/luasrc/uvl/errors.lua
index cf7d287dbfffb569f0cd4fec260ebc4bb57ca571..f3ae4b91468e97c04cf5d0308187ac42fd4069a7 100644 (file)
--- a/libs/uvl/luasrc/uvl/errors.lua
+++ b/libs/uvl/luasrc/uvl/errors.lua
@@ -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' },