yugui	2008-11-11 20:01:21 +0900 (Tue, 11 Nov 2008)

  New Revision: 20198

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

  Log:
    merges r20150 from trunk into ruby_1_9_1.
    * ext/stringio/stringio.c (strio_ungetc): ungetc position should
      not be changed from 1.8.   [ruby-core:19632]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/stringio/stringio.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20197)
+++ ruby_1_9_1/ChangeLog	(revision 20198)
@@ -1,3 +1,8 @@
+Sat Nov  8 17:31:41 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* ext/stringio/stringio.c (strio_ungetc): ungetc position should
+	  not be changed from 1.8.   [ruby-core:19632]
+
 Sat Nov  8 17:15:08 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/optparse.rb (OptionParser#make_switch): 1.9 Symbols respond
Index: ruby_1_9_1/ext/stringio/stringio.c
===================================================================
--- ruby_1_9_1/ext/stringio/stringio.c	(revision 20197)
+++ ruby_1_9_1/ext/stringio/stringio.c	(revision 20198)
@@ -721,7 +721,7 @@
 	}
     }
     /* get logical position */
-    lpos = 0; p = RSTRING_PTR(ptr->string); pend = p + ptr->pos - 1;
+    lpos = 0; p = RSTRING_PTR(ptr->string); pend = p + ptr->pos;
     for (;;) {
 	clen = rb_enc_mbclen(p, pend, enc);
 	if (p+clen >= pend) break;

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