From 7dbc41d60db9c4f0c3396c6ba7aabb26471003f4 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 27 Jul 2015 07:56:04 +0200
Subject: [PATCH] src: fix a few warings from recent crash reports

---
 src/etc/inc/filter.inc       | 2 +-
 src/etc/inc/interfaces.inc   | 2 +-
 src/etc/inc/services.inc     | 2 +-
 src/www/services_dnsmasq.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index ae70cd35d..b4310b8f1 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -3113,7 +3113,7 @@ EOD;
 	 *  interface in question to avoid problems with complicated routing
 	 *  topologies
 	 */
-	if(isset($config['filter']['bypassstaticroutes']) && is_array($config['staticroutes']['route']) && count($config['staticroutes']['route'])) {
+	if(isset($config['filter']['bypassstaticroutes']) && isset($config['staticroutes']['route']) && count($config['staticroutes']['route'])) {
 		$ipfrules .= "# Add rules to bypass firewall rules for static routes\n";
 		foreach (get_staticroutes() as $route) {
 			$friendly = $GatewaysList[$route['gateway']]['friendlyiface'];
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 768b1ebb3..e78737ce5 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -1665,7 +1665,7 @@ default:
 EOD;
 	$setdefaultgw = false;
 	$founddefaultgw = false;
-	if (is_array($config['gateways']['gateway_item'])) {
+	if (isset($config['gateways']['gateway_item'])) {
 		foreach($config['gateways']['gateway_item'] as $gateway) {
 			if($interface == $gateway['interface'] && isset($gateway['defaultgw'])) {
 				$setdefaultgw = true;
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 76f64b1dc..e0cbdc425 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -788,7 +788,7 @@ EOD;
 
 		// Handle option, number rowhelper values
 		$dhcpdconf .= "\n";
-		if($dhcpifconf['numberoptions']['item']) {
+		if (isset($dhcpifconf['numberoptions']['item'])) {
 			foreach($dhcpifconf['numberoptions']['item'] as $itemidx => $item) {
 				if(empty($item['type']) || $item['type'] == "text")
 					$dhcpdconf .= "	option custom-{$dhcpif}-{$itemidx} \"{$item['value']}\";\n";
diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index d9ef38ca1..c4f553458 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -403,7 +403,7 @@ function show_advanced_dns() {
 												</tr>
 											</table>
 									</tr>
-									<?php if ($hostent['aliases']['item'] && is_array($hostent['aliases']['item'])): ?>
+									<?php if (isset($hostent['aliases']['item'])): ?>
 									<?php foreach ($hostent['aliases']['item'] as $alias): ?>
 									<tr>
 										<td class="listlr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">