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::MessageDecoder): Raise

Browse source 
DecodeError if no data before the limit.
  Reported by Will Bryant.  [ruby-core:60557] [Bug #9498]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-02-08 06:29:54 +00:00
parent 61f50ae03e
commit 25a89ac0ac
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Feb 8 15:27:02 2014 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder): Raise
DecodeError if no data before the limit.
Reported by Will Bryant. [ruby-core:60557] [Bug #9498]
Sat Feb 8 15:11:21 2014 Tanaka Akira <akr@fsij.org> Sat Feb 8 15:11:21 2014 Tanaka Akira <akr@fsij.org>
* io.c (SMALLBUF): Unused macro removed. * io.c (SMALLBUF): Unused macro removed.

3
lib/resolv.rb
View file

@ -1528,6 +1528,7 @@ class Resolv
end end
def get_bytes(len = @limit - @index) def get_bytes(len = @limit - @index)
raise DecodeError.new("limit exceeded") if @limit < @index + len
d = @data[@index, len] d = @data[@index, len]
@index += len @index += len
return d return d
@ -1555,6 +1556,7 @@ class Resolv
end end
def get_string def get_string
raise DecodeError.new("limit exceeded") if @limit <= @index
len = @data[@index].ord len = @data[@index].ord
raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len
d = @data[@index + 1, len] d = @data[@index + 1, len]
@ -1578,6 +1580,7 @@ class Resolv
limit = @index if !limit || @index < limit limit = @index if !limit || @index < limit
d = [] d = []
while true while true
raise DecodeError.new("limit exceeded") if @limit <= @index
case @data[@index].ord case @data[@index].ord
when 0 when 0
@index += 1 @index += 1