Skip to content

Fix pure Ruby ByteBuffer byte range semantics #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −6
Open

Fix pure Ruby ByteBuffer byte range semantics #331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions lib/nio/bytebuffer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class ByteBuffer
include Enumerable

attr_reader :position, :limit, :capacity
alias size capacity

# Insufficient capacity in buffer
OverflowError = Class.new(IOError)
Expand Down Expand Up @@ -53,7 +54,7 @@ def clear
# @raise [ArgumentError] new position was invalid
def position=(new_position)
raise ArgumentError, "negative position given" if new_position < 0
raise ArgumentError, "specified position exceeds capacity" if new_position > @capacity
raise ArgumentError, "specified position exceeds limit" if new_position > @limit

@mark = nil if @mark && @mark > new_position
@position = new_position
Expand Down Expand Up @@ -99,7 +100,7 @@ def get(length = remaining)
raise ArgumentError, "negative length given" if length < 0
raise UnderflowError, "not enough data in buffer" if length > @limit - @position

result = @buffer[@position...length]
result = @buffer[@position, length]
@position += length
result
end
Expand Down Expand Up @@ -127,12 +128,13 @@ def [](index)
def put(str)
raise TypeError, "expected String, got #{str.class}" unless str.respond_to?(:to_str)

str = str.to_str
str = str.to_str.b

raise OverflowError, "buffer is full" if str.length > @limit - @position
length = str.bytesize
raise OverflowError, "buffer is full" if length > @limit - @position

@buffer[@position...str.length] = str
@position += str.length
@buffer[@position, length] = str
@position += length
self
end
alias << put
Expand Down