From: Bernhard Held <berny156@gmx.de>
To: development@lists.ipfire.org
Subject: [PATCH v3 1/4] Network::network_equal: fix check if array is fully defined
Date: Wed, 14 Feb 2018 20:35:19 +0100 [thread overview]
Message-ID: <20180214193522.26880-2-berny156@gmx.de> (raw)
In-Reply-To: <20180214193522.26880-1-berny156@gmx.de>
[-- Attachment #1: Type: text/plain, Size: 748 bytes --]
Correctly check length of list.
Credit to Bernhard Bitsch for pointing in the right direction.
---
config/cfgroot/network-functions.pl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl
index 2902aabb0..070e14d0f 100644
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -111,8 +111,9 @@ sub network_equal {
my @bin1 = &network2bin($network1);
my @bin2 = &network2bin($network2);
- if (!defined $bin1 || !defined $bin2) {
- return undef;
+ unless (scalar @bin1 == 2 &&
+ scalar @bin2 == 2) {
+ return;
}
if ($bin1[0] eq $bin2[0] && $bin1[1] eq $bin2[1]) {
--
2.16.1
next prev parent reply other threads:[~2018-02-14 19:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-14 19:35 [PATCH v3 0/4] proxy.cgi fixes for bugzilla #10852 Bernhard Held
2018-02-14 19:35 ` Bernhard Held [this message]
2018-02-14 22:11 ` [PATCH v3 1/4] Network::network_equal: fix check if array is fully defined Michael Tremer
2018-02-14 19:35 ` [PATCH v3 2/4] Network::network2bin: return an empty list in case of error Bernhard Held
2018-02-14 22:12 ` Michael Tremer
2018-02-14 22:59 ` Aw: " Bernhard Bitsch
2018-02-14 19:35 ` [PATCH v3 3/4] proxy.cgi: strip newline from subnet parameters Bernhard Held
2018-02-14 23:14 ` Aw: " Bernhard Bitsch
2018-02-15 6:38 ` Bernhard Held
2018-02-14 19:35 ` [PATCH v3 4/4] proxy.cgi: fix subnet comparison for proxy.pac generation Bernhard Held
2018-02-14 22:14 ` Michael Tremer
2018-02-15 7:15 ` Bernhard Held
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180214193522.26880-2-berny156@gmx.de \
--to=berny156@gmx.de \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox