From 461b1452da6ff1bddb5c25af232ac79f3d9bfb22 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 23 Dec 2010 12:45:09 +0000 Subject: merges r30094 from trunk into ruby_1_9_2. -- * test/ruby/test_string.rb (TestString#test_scan): add a test for [ruby-core:33338] #4087. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_string.rb | 8 ++++++++ version.h | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c0ee87c480..af8ea847ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 6 18:56:42 2010 Kazuhiro NISHIYAMA + + * test/ruby/test_string.rb (TestString#test_scan): add a test for + [ruby-core:33338] #4087. + Thu Dec 23 19:17:14 2010 Yuki Sonoda (Yugui) * test/net/imap/cacert.pem: updated because it has been expired. diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 5c2bce15cc..0d38c1a7f1 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -965,6 +965,14 @@ class TestString < Test::Unit::TestCase res = [] a.scan(/(...)/) { |w| res << w } assert_equal([[S("cru")], [S("el ")], [S("wor")]],res) + + a = S("hello") + a.taint + a.untrust + res = [] + a.scan(/./) { |w| res << w } + assert(res[0].tainted?, '[ruby-core:33338] #4087') + assert(res[0].untrusted?, '[ruby-core:33338] #4087') end def test_size diff --git a/version.h b/version.h index b175a544db..830e6011e0 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 118 +#define RUBY_PATCHLEVEL 119 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3