Nil protection

seud0nym · Feb 21, 2023 · 5d3f71b · 5d3f71b
1 parent 7e04d39
commit 5d3f71b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/build/lua/additional/common/devices/www/docroot/modals/device-modal.lp b/build/lua/additional/common/devices/www/docroot/modals/device-modal.lp
@@ -56,10 +56,12 @@ for _,p in ipairs(proxy.getPN("uci.dhcp.host.",true)) do
           local json = curl:read("*a")
           local devices = dkjson.decode(json)
           curl:close()
-          ap = gsub(ap,"_"," ")
-          for _,v in ipairs(devices) do
-            agentSTA[untaint(v.mac)] = format("%s - %s",ap,v.radio)
-            remoteSTAs = remoteSTAs + 1
+          if devices then
+            ap = gsub(ap,"_"," ")
+            for _,v in ipairs(devices) do
+              agentSTA[untaint(v.mac)] = format("%s - %s",ap,v.radio)
+              remoteSTAs = remoteSTAs + 1
+            end
           end
         else
           ngx.log(ngx.ERR,cmd)

diff --git a/build/lua/additional/common/devices/www/lua/devicescard_helper.lua b/build/lua/additional/common/devices/www/lua/devicescard_helper.lua
@@ -51,7 +51,7 @@ function M.getDevicesCardHTML(all)
               local json = curl:read("*a")
               local devices = dkjson.decode(json)
               curl:close()
-              nAPDevices = nAPDevices + #devices
+              nAPDevices = nAPDevices + (#devices or 0)
             else
               ngx.log(ngx.ERR,format("curl -qsklm1 --connect-timeout 1 http://%s:59595",ipv4[1].value))
             end