Skip to content

fix(IPAddress): remove redundant condition in fromString6 #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pruthvi828 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −1
Open

fix(IPAddress): remove redundant condition in fromString6 #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/IPAddress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ bool IPAddress::fromString6(const char *address) {
// :: allowed once
return false;
}
if (*address != '\0' && *(address + 1) == ':') {
if (*(address + 1) == ':') {
// ::: not allowed
return false;
}
Expand Down
2 changes: 2 additions & 0 deletions test/src/IPAddress/test_fromString6.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,13 @@ TEST_CASE ("Extract invalid IPv6 address", "[IPAddress-fromString-12]")
arduino::IPAddress ip;

REQUIRE(ip.fromString(":::") == false); // three colons by self
REQUIRE(ip.fromString("::::") == false); // four colons by self
REQUIRE(ip.fromString("::3:4:5:6::") == false); // two compressions
REQUIRE(ip.fromString("2001:db8:102:10304:506:708:90a:b0c") == false); // 5 character field
REQUIRE(ip.fromString("200x:db8:102:304:506:708:90a:b0c") == false); // invalid character
REQUIRE(ip.fromString("2001:db8:102:304::506:708:90a:b0c") == false); // double colon with 8 other fields (so not a compression)
REQUIRE(ip.fromString("2001:db8:102:304:::708:90a:b0c") == false); // three colons in middle
REQUIRE(ip.fromString("2001:db8:102:304::::708:90a:b0c") == false); // four colons in middle
REQUIRE(ip.fromString("2001:db8:102:304:506:708:90a:b0c:d0e") == false); // 9 fields
REQUIRE(ip.fromString("2001:db8:102:304:506:708:90a:") == false); // missing last group (but has a colon)
REQUIRE(ip.fromString("2001:db8:102:304:506:708:90a") == false); // only seven groups
Expand Down
Loading