From 7b560e31be52b880711204df6992c84185eac6cf Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 11 Mar 2017 10:44:13 +0000 Subject: merge revision(s) 57187,57234: [Backport #13075] pack.c: avoid returning uninitialized String Fix unpacking with 'b', 'B', 'h' and 'H' format. Do not return an uninitialized String to Ruby before filling the content bytes. Fixes r11175 ("pack.c (pack_unpack): execute block if given with unpacked value instead of creating an array", 2006-10-15). [ruby-core:78841] [Bug #13075] test/ruby/test_pack.rb: fix test case added by r57187 The test case for String#unpack added by r57187 is not properly testing because the String will be filled after the block invocation. [ruby-core:78841] [Bug #13075] Thanks to nagachika for pointing this out: http://d.hatena.ne.jp/nagachika/20161226/ruby_trunk_changes_57184_57194#r57187 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_pack.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test/ruby') diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index e9267fab1c..6d2eecbc9f 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -838,10 +838,18 @@ EXPECTED assert_equal addr, [buf].pack('p') end + def test_unpack_with_block + ret = []; "ABCD".unpack("CCCC") {|v| ret << v } + assert_equal [65, 66, 67, 68], ret + ret = []; "A".unpack("B*") {|v| ret << v.dup } + assert_equal ["01000001"], ret + end + def test_unpack1 assert_equal 65, "A".unpack1("C") assert_equal 68, "ABCD".unpack1("x3C") assert_equal 0x3042, "\u{3042 3044 3046}".unpack1("U*") assert_equal "hogefuga", "aG9nZWZ1Z2E=".unpack1("m") + assert_equal "01000001", "A".unpack1("B*") end end -- cgit v1.2.3