diff options
| -rw-r--r-- | lib/resolv.rb | 6 | ||||
| -rw-r--r-- | test/resolv/test_dns.rb | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index 17004b224b..a826f0c384 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -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 diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb index 0a06fba3e7..87b3bf9f37 100644 --- a/test/resolv/test_dns.rb +++ b/test/resolv/test_dns.rb @@ -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 |