Merge r4166

diff --git a/modules/admin-core/luasrc/tools/webadmin.lua b/modules/admin-core/luasrc/tools/webadmin.lua
index f7eddd8..62168eb 100644 (file)
--- a/modules/admin-core/luasrc/tools/webadmin.lua
+++ b/modules/admin-core/luasrc/tools/webadmin.lua
@@ -66,7 +66,7 @@ function network_get_addresses(net)
        local mav4 = state:get("network", net, "netmask")
        local ipv6 = state:get("network", net, "ip6addr")
        
-       if ipv4 and mav4 then
+       if ipv4 and mav4 and #ipv4 > 0 and #mav4 > 0 then
                ipv4 = luci.ip.IPv4(ipv4, mav4)
                
                if ipv4 then 
@@ -168,4 +168,4 @@ function iface_get_network(iface)
        )
        
        return net
-end
\ No newline at end of file
+end