From 410049d5f5f1abc4f60a817d2c33909af84fe116 Mon Sep 17 00:00:00 2001
From: Stephan de Wit <stephan.de.wit@deciso.com>
Date: Tue, 8 Aug 2023 13:27:16 +0200
Subject: [PATCH] dhcpv4/6: account for null values for static leases

---
 .../OPNsense/DHCPv4/Api/LeasesController.php           | 10 +++++-----
 .../OPNsense/DHCPv6/Api/LeasesController.php           |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
index 1940073cd..e9ecc7849 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
@@ -93,15 +93,15 @@ class LeasesController extends ApiControllerBase
         $statics = [];
         foreach ($sleases["dhcpd"] as $slease) {
             $static = [];
-            $static['address'] = $slease['ipaddr'];
+            $static['address'] = $slease['ipaddr'] ?? '';
             $static['type'] = 'static';
-            $static['mac'] = $slease['mac'];
+            $static['mac'] = $slease['mac'] ?? '';
             $static['starts'] = '';
             $static['ends'] = '';
-            $static['hostname'] = $slease['hostname'];
-            $static['descr'] = $slease['descr'];
+            $static['hostname'] = $slease['hostname'] ?? '';
+            $static['descr'] = $slease['descr'] ?? '';
             $static['if_descr'] = '';
-            $static['if'] = $slease['interface'];
+            $static['if'] = $slease['interface'] ?? '';
             $static['state'] = 'active';
             $static['status'] = in_array(strtolower($static['mac']), $online) ? 'online' : 'offline';
             $statics[] = $static;
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
index 88e596af3..e6ded108c 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
@@ -91,15 +91,15 @@ class LeasesController extends ApiControllerBase
         $statics = [];
         foreach ($sleases['dhcpd'] as $slease) {
             $static = [
-                'address' => $slease['ipaddrv6'],
+                'address' => $slease['ipaddrv6'] ?? '',
                 'type' => 'static',
                 'cltt' => '',
                 'ends' => '',
-                'descr' => $slease['descr'],
+                'descr' => $slease['descr'] ?? '',
                 'iaid' => '',
-                'duid' => $slease['duid'],
+                'duid' => $slease['duid'] ?? '',
                 'if_descr' => '',
-                'if' => $slease['interface'],
+                'if' => $slease['interface'] ?? '',
                 'state' => 'active',
                 'status' => in_array(strtolower($slease['ipaddrv6']), $online) ? 'online' : 'offline'
             ];