From 170aace2d9db80205432a2fe6d782f77b207717e Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 14 Jan 2017 02:26:49 +0000 Subject: resolv.rb: byte buffer * lib/resolv.rb (Resolv::DNS::Message::MessageDecoder): treat the data as a byte buffer. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/resolv.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/resolv.rb b/lib/resolv.rb index ebb2a9c411..f370dba8f0 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1521,12 +1521,12 @@ class Resolv def initialize(data) @data = data @index = 0 - @limit = data.length + @limit = data.bytesize yield self end def inspect - "\#<#{self.class}: #{@data[0, @index].inspect} #{@data[@index..-1].inspect}>" + "\#<#{self.class}: #{@data.byteslice(0, @index).inspect} #{@data.byteslice(@index..-1).inspect}>" end def get_length16 @@ -1545,7 +1545,7 @@ class Resolv def get_bytes(len = @limit - @index) raise DecodeError.new("limit exceeded") if @limit < @index + len - d = @data[@index, len] + d = @data.byteslice(@index, len) @index += len return d end @@ -1573,9 +1573,9 @@ class Resolv def get_string raise DecodeError.new("limit exceeded") if @limit <= @index - len = @data[@index].ord + len = @data.getbyte(@index) raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len - d = @data[@index + 1, len] + d = @data.byteslice(@index + 1, len) @index += 1 + len return d end @@ -1598,7 +1598,7 @@ class Resolv d = [] while true raise DecodeError.new("limit exceeded") if @limit <= @index - case @data[@index].ord + case @data.getbyte(@index) when 0 @index += 1 if save_index -- cgit v1.2.3