archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 199b59f065: [Backport #19116]

Browse source 
Fix bug in array pack with shared strings

	If string literals are long and they become shared, we need to make them
	independent before we can write to them. [Bug #19116]
	---
	 pack.c                  | 1 +
	 test/ruby/test_array.rb | 6 ++++++
	 2 files changed, 7 insertions(+)
This commit is contained in:
nagachika 2022-11-13 11:13:53 +09:00
parent 0f334f90d0
commit db1aa39ffc
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pack.c
View file

@ -212,12 +212,13 @@ pack_pack(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer)
pend = p + RSTRING_LEN(fmt); pend = p + RSTRING_LEN(fmt);
if (NIL_P(buffer)) { if (NIL_P(buffer)) {
res = rb_str_buf_new(0); res = rb_str_buf_new(0);
} }
else { else {
if (!RB_TYPE_P(buffer, T_STRING)) if (!RB_TYPE_P(buffer, T_STRING))
rb_raise(rb_eTypeError, "buffer must be String, not %s", rb_obj_classname(buffer)); rb_raise(rb_eTypeError, "buffer must be String, not %s", rb_obj_classname(buffer));
res = buffer; rb_str_modify(buffer);
res = buffer;
} }
idx = 0; idx = 0;

6
test/ruby/test_array.rb
View file

@ -1294,6 +1294,12 @@ class TestArray < Test::Unit::TestCase
=end =end
end end
def test_pack_with_buffer
n = [ 65, 66, 67 ]
str = "a" * 100
assert_equal("aaaABC", n.pack("@3ccc", buffer: str.dup), "[Bug #19116]")
end
def test_pop def test_pop
a = @cls[ 'cat', 'dog' ] a = @cls[ 'cat', 'dog' ]
assert_equal('dog', a.pop) assert_equal('dog', a.pop)

4
version.h
View file

@ -11,11 +11,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3 #define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 177 #define RUBY_PATCHLEVEL 178
#define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 11 #define RUBY_RELEASE_MONTH 11
#define RUBY_RELEASE_DAY 5 #define RUBY_RELEASE_DAY 13
#include "ruby/version.h" #include "ruby/version.h"