mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
[ruby/resolv] Limit decompressed name length
RFC 1035 specifies the 255-octet maximum name length. This change set
checks the limit.
4c2f71b5e8
This commit is contained in:
parent
680383c642
commit
9aa0300db2
2 changed files with 12 additions and 1 deletions
|
@ -1679,6 +1679,7 @@ class Resolv
|
|||
prev_index = @index
|
||||
save_index = nil
|
||||
d = []
|
||||
size = -1
|
||||
while true
|
||||
raise DecodeError.new("limit exceeded") if @limit <= @index
|
||||
case @data.getbyte(@index)
|
||||
|
@ -1699,7 +1700,10 @@ class Resolv
|
|||
end
|
||||
@index = idx
|
||||
else
|
||||
d << self.get_label
|
||||
l = self.get_label
|
||||
d << l
|
||||
size += 1 + l.string.bytesize
|
||||
raise DecodeError.new("name label data exceed 255 octets") if size > 255
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -627,6 +627,13 @@ class TestResolvDNS < Test::Unit::TestCase
|
|||
assert_operator(2**14, :<, m.to_s.length)
|
||||
end
|
||||
|
||||
def test_too_long_address
|
||||
too_long_address_message = [0, 0, 1, 0, 0, 0].pack("n*") + "\x01x" * 129 + [0, 0, 0].pack("cnn")
|
||||
assert_raise_with_message(Resolv::DNS::DecodeError, /name label data exceed 255 octets/) do
|
||||
Resolv::DNS::Message.decode too_long_address_message
|
||||
end
|
||||
end
|
||||
|
||||
def assert_no_fd_leak
|
||||
socket = assert_throw(self) do |tag|
|
||||
Resolv::DNS.stub(:bind_random_port, ->(s, *) {throw(tag, s)}) do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue