yugui	2010-12-23 21:45:09 +0900 (Thu, 23 Dec 2010)

  New Revision: 30313

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30313

  Log:
    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.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/ruby/test_string.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30312)
+++ ruby_1_9_2/ChangeLog	(revision 30313)
@@ -1,3 +1,8 @@
+Mon Dec  6 18:56:42 2010  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* 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)  <yugui@y...>
 
 	* test/net/imap/cacert.pem: updated because it has been expired.
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30312)
+++ ruby_1_9_2/version.h	(revision 30313)
@@ -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
Index: ruby_1_9_2/test/ruby/test_string.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_string.rb	(revision 30312)
+++ ruby_1_9_2/test/ruby/test_string.rb	(revision 30313)
@@ -965,6 +965,14 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/