mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* pack.c (pack_unpack): the resulted string of unpack('M') must have
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:
parent
a2e9ec244e
commit
2dbf7d11f2
3 changed files with 8 additions and 1 deletions
|
@ -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>
|
||||
|
||||
* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
|
||||
|
|
2
pack.c
2
pack.c
|
@ -2024,7 +2024,7 @@ pack_unpack(VALUE str, VALUE fmt)
|
|||
s++;
|
||||
}
|
||||
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);
|
||||
}
|
||||
break;
|
||||
|
|
|
@ -570,6 +570,8 @@ class TestPack < Test::Unit::TestCase
|
|||
assert_equal(["\x0a"], "=0A=\n".unpack("M"))
|
||||
assert_equal([""], "=0Z=\n".unpack("M"))
|
||||
assert_equal([""], "=\r\n".unpack("M"))
|
||||
assert_equal([""], "=\r\n".unpack("M"))
|
||||
assert_equal(["\xC6\xF7"], "=C6=F7".unpack('M*'))
|
||||
end
|
||||
|
||||
def test_pack_unpack_P2
|
||||
|
|
Loading…
Reference in a new issue