diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-04 12:30:06 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-04 12:30:06 +0000 |
commit | 102ccac988dc4f27fb3ad9286e4177aef138a170 (patch) | |
tree | e663af648eee76eb84a69a90f3c16dc099330d45 | |
parent | 52e721592fc2f9bcb55cfbbd7002ae0ff7003338 (diff) |
merges r23160 from trunk into ruby_1_9_1.
--
* string.c (rb_str_dump): buffer length plus one byte for null
terminator. [ruby-dev:38294]
* test/ruby/test_m17n.rb (test_str_dump): add a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | string.c | 2 | ||||
-rw-r--r-- | test/ruby/test_m17n.rb | 3 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Wed Apr 8 21:58:12 2009 Yusuke Endoh <mame@tsg.ne.jp> + + * string.c (rb_str_dump): buffer length plus one byte for null + terminator. [ruby-dev:38294] + + * test/ruby/test_m17n.rb (test_str_dump): add a test for above. + Wed Apr 8 20:08:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_rstrip_bang): should not sign-expand non-ascii. @@ -4167,7 +4167,7 @@ rb_str_dump(VALUE str) result = rb_str_new5(str, 0, len); p = RSTRING_PTR(str); pend = p + RSTRING_LEN(str); - q = RSTRING_PTR(result); qend = q + len; + q = RSTRING_PTR(result); qend = q + len + 1; *q++ = '"'; while (p < pend) { diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 2f435f645a..e327ead045 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -241,6 +241,9 @@ class TestM17N < Test::Unit::TestCase u("\xfc"), "\u3042", "ascii", + + "\u3042".encode("UTF-16LE"), + "\u3042".encode("UTF-16BE"), ].each do |str| assert_equal(str, eval(str.dump), "[ruby-dev:33142]") end |