From: Alexander Marx <alexander.marx@ipfire.org>
Date: Tue, 7 Nov 2017 13:53:27 +0000 (+0100)
Subject: Network-functions: add check if variables are defined
X-Git-Tag: v2.19-core117~1^2~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f3974b711391b6bbc05e5435398c1b3ee26c6e8;p=ipfire-2.x.git

Network-functions: add check if variables are defined

in function network_equal and network2bin a check for undefined variables were missing.
added them.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl
index 25f9af1cad..2902aabb04 100644
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -111,6 +111,10 @@ sub network_equal {
 	my @bin1 = &network2bin($network1);
 	my @bin2 = &network2bin($network2);
 
+	if (!defined $bin1 || !defined $bin2) {
+		return undef;
+	}
+
 	if ($bin1[0] eq $bin2[0] && $bin1[1] eq $bin2[1]) {
 		return 1;
 	}
@@ -133,6 +137,10 @@ sub network2bin($) {
 	my $address_bin = &ip2bin($address);
 	my $netmask_bin = &ip2bin($netmask);
 
+	if (!defined $address_bin || !defined $netmask_bin) {
+		return undef;
+	}
+
 	my $network_start = $address_bin & $netmask_bin;
 
 	return ($network_start, $netmask_bin);