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

Fix handling of frozens strings.

Browse Source
This commit is contained in:
Samuel Williams 2021-12-20 09:43:22 +13:00
parent 9de5c4ec76
commit 71bf5cef75
Notes: git 2021-12-21 08:26:09 +09:00 
Merged: https://github.com/ruby/ruby/pull/5303
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
io_buffer.c
View File

@ -279,7 +279,12 @@ rb_io_buffer_type_for(VALUE klass, VALUE string)
rb_str_locktmp(string); rb_str_locktmp(string);
io_buffer_initialize(data, RSTRING_PTR(string), RSTRING_LEN(string), RB_IO_BUFFER_EXTERNAL, string); enum rb_io_buffer_flags flags = RB_IO_BUFFER_EXTERNAL;
if (RB_OBJ_FROZEN(string))
flags |= RB_IO_BUFFER_IMMUTABLE;
io_buffer_initialize(data, RSTRING_PTR(string), RSTRING_LEN(string), flags, string);
return instance; return instance;
} }

8
test/ruby/test_io_buffer.rb
View File

@ -83,6 +83,7 @@ class TestIOBuffer < Test::Unit::TestCase
def test_string_mapped def test_string_mapped
string = "Hello World" string = "Hello World"
buffer = IO::Buffer.for(string) buffer = IO::Buffer.for(string)
refute buffer.immutable?
# Cannot modify string as it's locked by the buffer: # Cannot modify string as it's locked by the buffer:
assert_raise RuntimeError do assert_raise RuntimeError do
@ -99,6 +100,13 @@ class TestIOBuffer < Test::Unit::TestCase
assert_equal "Hello World", string assert_equal "Hello World", string
end end
def test_string_mapped_frozen
string = "Hello World".freeze
buffer = IO::Buffer.for(string)
assert buffer.immutable?
end
def test_non_string def test_non_string
not_string = Object.new not_string = Object.new