base: webadmin: Don't take substring of nil variable 930/head
authorDaniel Dickinson <lede@cshore.thecshore.com>
Thu, 29 Dec 2016 20:04:57 +0000 (15:04 -0500)
committerDaniel Dickinson <lede@cshore.thecshore.com>
Fri, 30 Dec 2016 18:44:22 +0000 (13:44 -0500)
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 <lede@cshore.thecshore.com>
modules/luci-base/luasrc/tools/webadmin.lua

index 8273175de7d1398aefdc47f5651d6676292893d6..106810aa03e44e6ac1fa22dd0af436d4b821fbeb 100644 (file)
@@ -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