From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] Network-functions: add check if variables are defined Date: Tue, 07 Nov 2017 14:53:27 +0100 Message-ID: <1510062807-12906-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1638413863510773710==" List-Id: --===============1638413863510773710== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable in function network_equal and network2bin a check for undefined variables wer= e missing. added them. --- config/cfgroot/network-functions.pl | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-fun= ctions.pl index 93b8190..9e50d7c 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -108,10 +108,14 @@ sub network_equal { my $network1 =3D shift; my $network2 =3D shift; =20 - my $bin1 =3D &network2bin($network1); - my $bin2 =3D &network2bin($network2); + my @bin1 =3D &network2bin($network1); + my @bin2 =3D &network2bin($network2); =20 - if ($bin1 eq $bin2) { + if(!defined $bin1 || !defined $bin2){ + return undef; + } + + if ($bin1[0] eq $bin2[0] && $bin1[1] eq $bin2[1]){ return 1; } =20 @@ -132,6 +136,10 @@ sub network2bin($) { =20 my $address_bin =3D &ip2bin($address); my $netmask_bin =3D &ip2bin($netmask); +=09 + if (!defined $address_bin || !defined $netmask_bin){ + return undef; + } =20 my $network_start =3D $address_bin & $netmask_bin; =20 @@ -457,7 +465,7 @@ sub testsuite() { assert(!$result); =20 $result =3D &network_equal("192.168.0.1/24", "192.168.0.XXX/24"); - assert($result); + assert(!$result); =20 $result =3D &ip_address_in_network("10.0.1.4", "10.0.0.0/8"); assert($result); --=20 2.7.4 --===============1638413863510773710==--