summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjim-p <jimp@netgate.com>2018-11-12 09:37:18 -0500
committerjim-p <jimp@netgate.com>2018-11-12 09:37:34 -0500
commit345ff3124ce273eb4de01b107ecd327769628249 (patch)
tree569825d959f907f438229b6d5d82d1c06d0fd00c /src
parentdfbf0d5f3417c78025cafabadb47c2dae43954f4 (diff)
downloadpfsense-345ff3124ce273eb4de01b107ecd327769628249.zip
pfsense-345ff3124ce273eb4de01b107ecd327769628249.tar.gz
Initialize QinQ arrays before use. Fixes #9109
(cherry picked from commit 439d9beba0213c96281d8ff6b09ccb8136b1a0aa)
Diffstat (limited to 'src')
-rw-r--r--src/usr/local/www/interfaces_qinq.php9
-rw-r--r--src/usr/local/www/interfaces_qinq_edit.php5
2 files changed, 2 insertions, 12 deletions
diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php
index 0457f20..7feef61 100644
--- a/src/usr/local/www/interfaces_qinq.php
+++ b/src/usr/local/www/interfaces_qinq.php
@@ -29,14 +29,7 @@
require_once("guiconfig.inc");
require_once("functions.inc");
-if (!is_array($config['qinqs'])) {
- $config['qinqs'] = array();
-}
-
-if (!is_array($config['qinqs']['qinqentry'])) {
- $config['qinqs']['qinqentry'] = array();
-}
-
+init_config_arr(array('qinqs', 'qinqentry'));
$a_qinqs = &$config['qinqs']['qinqentry'];
if ($_POST['act'] == "del") {
diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php
index 58e1c18..4314b29 100644
--- a/src/usr/local/www/interfaces_qinq_edit.php
+++ b/src/usr/local/www/interfaces_qinq_edit.php
@@ -32,10 +32,7 @@ $shortcut_section = "interfaces";
require_once("guiconfig.inc");
-if (!is_array($config['qinqs']['qinqentry'])) {
- $config['qinqs']['qinqentry'] = array();
-}
-
+init_config_arr(array('qinqs', 'qinqentry'));
$a_qinqs = &$config['qinqs']['qinqentry'];
$portlist = get_interface_list();
OpenPOWER on IntegriCloud