From: Daniel Dickinson Date: Thu, 29 Dec 2016 20:04:57 +0000 (-0500) Subject: base: webadmin: Don't take substring of nil variable X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7bfd36d5855100fe18a7759644aef697e9d03cee;p=oweals%2Fluci.git base: webadmin: Don't take substring of nil variable When converting interface names to UCI network names webadmin fails if there is no UCI network name because webadmin failed to ensure uciname has a value before attempting to take a substring. Signed-off-by: Daniel Dickinson --- diff --git a/modules/luci-base/luasrc/tools/webadmin.lua b/modules/luci-base/luasrc/tools/webadmin.lua index 8273175de..106810aa0 100644 --- a/modules/luci-base/luasrc/tools/webadmin.lua +++ b/modules/luci-base/luasrc/tools/webadmin.lua @@ -96,7 +96,7 @@ function iface_get_network(iface) if net.l3_device == iface or net.device == iface then -- cross check with uci to filter out @name style aliases local uciname = cur:get("network", net.interface, "ifname") - if not uciname or uciname:sub(1, 1) ~= "@" then + if type(uciname) == "string" and uciname:sub(1,1) ~= "@" or uciname then return net.interface end end