nobu	2012-01-04 14:24:39 +0900 (Wed, 04 Jan 2012)

  New Revision: 34208

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

  Log:
    * string.c (str_nth_len): count ascii-only run at the end.  this
      bug appears only when single-byte-optimization is disabled due
      to unknown coderange.  [ruby-core:41896] [Bug #5836]

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_m17n.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34207)
+++ ChangeLog	(revision 34208)
@@ -1,3 +1,9 @@
+Wed Jan  4 14:24:33 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (str_nth_len): count ascii-only run at the end.  this
+	  bug appears only when single-byte-optimization is disabled due
+	  to unknown coderange.  [ruby-core:41896] [Bug #5836]
+
 Wed Jan  4 11:32:07 2012  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (check_valid_dir): special case for a root directory.
Index: string.c
===================================================================
--- string.c	(revision 34207)
+++ string.c	(revision 34208)
@@ -1483,6 +1483,7 @@
             if (ISASCII(*p)) {
                 p2 = search_nonascii(p, e2);
                 if (!p2) {
+		    nth -= e2 - p;
 		    *nthp = nth;
                     return (char *)e2;
                 }
Index: test/ruby/test_m17n.rb
===================================================================
--- test/ruby/test_m17n.rb	(revision 34207)
+++ test/ruby/test_m17n.rb	(revision 34208)
@@ -930,6 +930,15 @@
     assert_equal("\u{439}", "a\u{439}bcdefghijklmnop"[1, 1][0, 1], bug2379)
   end
 
+  def test_str_aref_force_encoding
+    bug5836 = '[ruby-core:41896]'
+    Encoding.list.each do |enc|
+      next unless enc.ascii_compatible?
+      s = "abc".force_encoding(enc)
+      assert_equal("", s[3, 1], bug5836)
+    end
+  end
+
   def test_aset
     s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4")
     assert_raise(Encoding::CompatibilityError){s["\xb0\xa3"] = "foo"}

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