kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/resolv.rb (Resolv::DNS::Message::MessageEncoder#put_labels):

Browse source 
Prevent overflow of pointer to labels.
  Patch by Hannes Georg.  [ruby-core:71248] [Bug #11632]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2015-11-09 15:37:04 +00:00
parent a3e4d6a56e
commit 60055f8dfd
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Nov 10 00:36:46 2015 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::DNS::Message::MessageEncoder#put_labels):
Prevent overflow of pointer to labels.
Patch by Hannes Georg. [ruby-core:71248] [Bug #11632]
Tue Nov 10 00:25:41 2015 Kazuki Tsujimoto <kazuki@callcc.net>
* gems/bundled_gems: update to power_assert 0.2.6.

4
lib/resolv.rb
View file

@ -1477,7 +1477,9 @@ class Resolv
self.put_pack("n", 0xc000 | idx)
return
else
@names[domain] = @data.length
if @data.length < 0x4000
@names[domain] = @data.length
end
self.put_label(d[i])
end
}

17
test/resolv/test_dns.rb
View file

@ -197,4 +197,21 @@ class TestResolvDNS < Test::Unit::TestCase
expected = (['0'] * 32 + ['ip6', 'arpa']).map {|label| Resolv::DNS::Label::Str.new(label) }
assert_equal(expected, labels)
end
def test_too_big_label_address
n = 2000
m = Resolv::DNS::Message::MessageEncoder.new {|msg|
2.times {
n.times {|i| msg.put_labels(["foo#{i}"]) }
}
}
Resolv::DNS::Message::MessageDecoder.new(m.to_s) {|msg|
2.times {
n.times {|i|
assert_equal(["foo#{i}"], msg.get_labels.map {|label| label.to_s })
}
}
}
assert_operator(2**14, :<, m.to_s.length)
end
end