From 60d976b3ddbbb77f378c34f6633efb2cf4331d15 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 31 May 2011 03:18:19 +0000 Subject: [PATCH] merges r30542 from trunk into ruby_1_9_2. Fixes #4279. -- * 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/branches/ruby_1_9_2@31852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ pack.c | 2 +- test/ruby/test_pack.rb | 2 ++ version.h | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e911ab5fc..5eda90ccc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 14 14:01:12 2011 NARUSE, Yui + + * pack.c (pack_unpack): the resulted string of unpack('M') must have + ASCII-8BIT encoding (and ENC_CODERANGE_VALID). [ruby-core:34482] + Sat Dec 25 20:01:40 2010 KOSAKI Motohiro * io.c (pipe_open): Added rb_thread_atfork(). We must reinitialize diff --git a/pack.c b/pack.c index d659266a41..7366b765a7 100644 --- a/pack.c +++ b/pack.c @@ -1978,7 +1978,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; diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index 8fa0a90915..77078d5cac 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -555,6 +555,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 diff --git a/version.h b/version.h index 536994e91e..8d00c9b724 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 267 +#define RUBY_PATCHLEVEL 268 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1