diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-18 10:43:48 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-18 10:43:48 +0000 |
commit | 4fdfac491a95b99ad782991d9eaaa35456f897b5 (patch) | |
tree | de77dd53b9f14c7ddc5854bb51ff210bb504e638 | |
parent | b0416f342a2b2f43a17189fdbb24e53cef08e4ba (diff) |
merges r30721 from trunk into ruby_1_9_2.
--
* array.c (rb_ary_join): [].join.encoding must be US-ASCII.
[ruby-list:47790]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | array.c | 2 | ||||
-rw-r--r-- | test/ruby/test_array.rb | 1 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Jan 29 22:16:26 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * array.c (rb_ary_join): [].join.encoding must be US-ASCII. + [ruby-list:47790] + Fri Jan 28 12:05:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * configure.in: Add #include<sys/stat.h> when struct stat is @@ -1643,7 +1643,7 @@ rb_ary_join(VALUE ary, VALUE sep) int untrust = FALSE; VALUE val, tmp, result; - if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0); + if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0); if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = TRUE; if (OBJ_UNTRUSTED(ary) || OBJ_UNTRUSTED(sep)) untrust = TRUE; diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 1816ea1d02..1c80f2d145 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -890,6 +890,7 @@ class TestArray < Test::Unit::TestCase a = @cls[] assert_equal("", a.join) assert_equal("", a.join(',')) + assert_equal(Encoding::US_ASCII, a.join.encoding) $, = "" a = @cls[1, 2] @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 178 +#define RUBY_PATCHLEVEL 179 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |