Skip to content

Fix Socket::IPAddress IPv4 address in IPv6 with zone identifier #16813

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
straight-shoota wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −1
Open

Fix Socket::IPAddress IPv4 address in IPv6 with zone identifier #16813

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: 2 additions & 0 deletions spec/std/socket/address_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ describe Socket::IPAddress do
it { Socket::IPAddress.parse_v6_fields?("c0a8").should be_nil }
it { Socket::IPAddress.parse_v6_fields?("fe80::a:b%eth0").should eq UInt16.static_array(0xfe80, 0, 0, 0, 0, 0, 0xa, 0xb) }
it { Socket::IPAddress.parse_v6_fields?("fe80:0:0:0:ffff:c0a8:5e4%lo").should eq UInt16.static_array(0xfe80, 0, 0, 0, 0xffff, 0xc0a8, 0x5e4, 0) }

it { Socket::IPAddress.parse_v6_fields?("fe80::192.168.0.1%eth0").should eq UInt16.static_array(0xfe80, 0, 0, 0, 0, 0, 0xc0a8, 0x0001) }
end

describe ".v4" do
Expand Down
7 changes: 6 additions & 1 deletion src/socket/address.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,12 @@ class Socket
end

if need_v4
x0, x1, x2, x3 = parse_v4_fields?(Slice.new(ptr, finish - ptr)) || return nil
slice = Slice.new(ptr, finish - ptr)
if suffix = slice.index('%'.ord.to_u8!)
zone_slice = slice[suffix..] + 1
slice = slice[0, suffix]
end
x0, x1, x2, x3 = parse_v4_fields?(slice) || return nil
fields[6] = x0.to_u16! << 8 | x1
fields[7] = x2.to_u16! << 8 | x3
end
Expand Down
Loading