1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve behavioural consistency of unallocated (zero length) IO::Buffer. (#9532)

Browse Source 
This makes the behaviour of IO::Buffer.new(0) and IO::Buffer.new.slice(0, 0) consistent.

Fixes https://bugs.ruby-lang.org/issues/19542 and https://bugs.ruby-lang.org/issues/18805.
This commit is contained in:
Samuel Williams 2024-01-15 10:47:13 +13:00 committed by GitHub
parent 5c823aa686
commit c5cf4d4e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
io_buffer.c
View File

@ -854,11 +854,10 @@ io_buffer_get_bytes_for_writing(struct rb_io_buffer *buffer, void **base, size_t
if (buffer->base) {
*base = buffer->base;
*size = buffer->size;
return;
} else {
*base = NULL;
*size = 0;
}
rb_raise(rb_eIOBufferAllocationError, "The buffer is not allocated!");
}
void
@ -880,11 +879,10 @@ io_buffer_get_bytes_for_reading(struct rb_io_buffer *buffer, const void **base,
if (buffer->base) {
*base = buffer->base;
*size = buffer->size;
return;
} else {
*base = NULL;
*size = 0;
}
rb_raise(rb_eIOBufferAllocationError, "The buffer is not allocated!");
}
void

35
test/ruby/test_io_buffer.rb
View File

@ -199,6 +199,14 @@ class TestIOBuffer < Test::Unit::TestCase
assert_positive buffer2 <=> buffer1
end
def test_compare_zero_length
buffer1 = IO::Buffer.new(0)
buffer2 = IO::Buffer.new(1)
assert_negative buffer1 <=> buffer2
assert_positive buffer2 <=> buffer1
end
def test_slice
buffer = IO::Buffer.new(128)
slice = buffer.slice(8, 32)
@ -270,6 +278,14 @@ class TestIOBuffer < Test::Unit::TestCase
end
end
def test_zero_length_get_string
buffer = IO::Buffer.new.slice(0, 0)
assert_equal "", buffer.get_string
buffer = IO::Buffer.new(0)
assert_equal "", buffer.get_string
end
# We check that values are correctly round tripped.
RANGES = {
:U8 => [0, 2**8-1],
@ -316,6 +332,13 @@ class TestIOBuffer < Test::Unit::TestCase
end
end
def test_zero_length_get_set_values
buffer = IO::Buffer.new(0)
assert_equal [], buffer.get_values([], 0)
assert_equal 0, buffer.set_values([], 0, [])
end
def test_values
buffer = IO::Buffer.new(128)
@ -340,6 +363,12 @@ class TestIOBuffer < Test::Unit::TestCase
end
end
def test_zero_length_each
buffer = IO::Buffer.new(0)
assert_equal [], buffer.each(:U8).to_a
end
def test_each_byte
string = "The quick brown fox jumped over the lazy dog."
buffer = IO::Buffer.for(string)
@ -347,6 +376,12 @@ class TestIOBuffer < Test::Unit::TestCase
assert_equal string.bytes, buffer.each_byte.to_a
end
def test_zero_length_each_byte
buffer = IO::Buffer.new(0)
assert_equal [], buffer.each_byte.to_a
end
def test_clear
buffer = IO::Buffer.new(16)
buffer.set_string("Hello World!")