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

* pack.c (pack_unpack): the resulted string of unpack('M') must have

Browse Source 
ASCII-8BIT encoding (and ENC_CODERANGE_VALID). [ruby-core:34482]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-01-14 05:03:22 +00:00
parent a2e9ec244e
commit 2dbf7d11f2
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jan 14 14:01:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
* pack.c (pack_unpack): the resulted string of unpack('M') must have
ASCII-8BIT encoding (and ENC_CODERANGE_VALID). [ruby-core:34482]
Fri Jan 14 13:38:58 2011 NARUSE, Yui <naruse@ruby-lang.org> Fri Jan 14 13:38:58 2011 NARUSE, Yui <naruse@ruby-lang.org>
* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in * ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in

2
pack.c
View File

@ -2024,7 +2024,7 @@ pack_unpack(VALUE str, VALUE fmt)
s++; s++;
} }
rb_str_set_len(buf, ptr - RSTRING_PTR(buf)); rb_str_set_len(buf, ptr - RSTRING_PTR(buf));
ENCODING_CODERANGE_SET(buf, rb_usascii_encindex(), ENC_CODERANGE_7BIT); ENCODING_CODERANGE_SET(buf, rb_ascii8bit_encindex(), ENC_CODERANGE_VALID);
UNPACK_PUSH(buf); UNPACK_PUSH(buf);
} }
break; break;

2
test/ruby/test_pack.rb
View File

@ -570,6 +570,8 @@ class TestPack < Test::Unit::TestCase
assert_equal(["\x0a"], "=0A=\n".unpack("M")) assert_equal(["\x0a"], "=0A=\n".unpack("M"))
assert_equal([""], "=0Z=\n".unpack("M")) assert_equal([""], "=0Z=\n".unpack("M"))
assert_equal([""], "=\r\n".unpack("M")) assert_equal([""], "=\r\n".unpack("M"))
assert_equal([""], "=\r\n".unpack("M"))
assert_equal(["\xC6\xF7"], "=C6=F7".unpack('M*'))
end end
def test_pack_unpack_P2 def test_pack_unpack_P2