diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-08 06:29:54 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-08 06:29:54 +0000 |
| commit | 25a89ac0ac9e0139d4d51ef57b0a80696fbc08bc (patch) | |
| tree | 3e480e1241a0f17ca99e0e77df097290741cdf13 | |
| parent | 61f50ae03e5099820f3a8949f6375f5d8a17c5f0 (diff) | |
* 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/trunk@44884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/resolv.rb | 3 |
2 files changed, 9 insertions, 0 deletions
@@ -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> * io.c (SMALLBUF): Unused macro removed. diff --git a/lib/resolv.rb b/lib/resolv.rb index 579f8885ae..6b2fa9d903 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1528,6 +1528,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 @@ -1555,6 +1556,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] @@ -1578,6 +1580,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 |