diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-15 14:59:17 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-15 14:59:17 +0000 |
| commit | d9e36580efff79a791ac7122fc4b83b171e53cde (patch) | |
| tree | 80300d54bda09327cf419f33881cfcf14ce9cabe /lib | |
| parent | f9acab1f4298f909624440d98996ffe1b7b6da82 (diff) | |
merge revision(s) r44884: [Backport #9498]
* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder): Raise
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/branches/ruby_2_0_0@44976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/resolv.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index f7232c18ff..4214465516 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1489,6 +1489,7 @@ class Resolv end def get_bytes(len = @limit - @index) + raise DecodeError.new("limit exceeded") if @limit < @index + len d = @data[@index, len] @index += len return d @@ -1516,6 +1517,7 @@ class Resolv end def get_string + raise DecodeError.new("limit exceeded") if @limit <= @index len = @data[@index].ord raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len d = @data[@index + 1, len] @@ -1539,6 +1541,7 @@ class Resolv limit = @index if !limit || @index < limit d = [] while true + raise DecodeError.new("limit exceeded") if @limit <= @index case @data[@index].ord when 0 @index += 1 |