nobu	2008-06-06 12:20:36 +0900 (Fri, 06 Jun 2008)

  New Revision: 16851

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/iconv/iconv.c
    branches/ruby_1_8/version.h

  Log:
    * ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
      [ruby-core:17115]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=16851&r2=16850&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=16851&r2=16850&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/iconv/iconv.c?r1=16851&r2=16850&diff_format=u

Index: ruby_1_8/ext/iconv/iconv.c
===================================================================
--- ruby_1_8/ext/iconv/iconv.c	(revision 16850)
+++ ruby_1_8/ext/iconv/iconv.c	(revision 16851)
@@ -755,7 +755,12 @@
     if (!NIL_P(str)) slen = RSTRING_LEN(StringValue(str));
     if (argc != 2 || !RTEST(rb_range_beg_len(n1, &start, &length, slen, 0))) {
 	if (NIL_P(n1) || ((start = NUM2LONG(n1)) < 0 ? (start += slen) >= 0 : start < slen)) {
-	    if (!NIL_P(n2)) length = NUM2LONG(n2);
+	    if (NIL_P(n2)) {
+		length = -1;
+	    }
+	    else if ((length = NUM2LONG(n2)) >= slen - start) {
+		length = slen - start;
+	    }
 	}
     }
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16850)
+++ ruby_1_8/ChangeLog	(revision 16851)
@@ -1,3 +1,8 @@
+Fri Jun  6 12:20:33 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
+	  [ruby-core:17115]
+
 Fri Jun  6 00:05:33 2008  Tanaka Akira  <akr@f...>
 
 	* lib/time.rb (Time.xmlschema): don't use float.  fix
@@ -17,16 +22,6 @@
 	  workaround for the case where OpenSSL is configured with
 	  --enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
 
-Thu Jun  5 11:01:08 2008  Nobuyoshi Nakada  <nobu@r...>
-
-	* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
-	  [ruby-core:17115]
-
-Thu Jun  5 11:00:48 2008  Nobuyoshi Nakada  <nobu@r...>
-
-	* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
-	  [ruby-core:17115]
-
 Wed Jun  4 19:36:45 2008  Akinori MUSHA  <knu@i...>
 
 	* object.c (rb_obj_alloc): RDoc updated.  a patch from Gaston
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 16850)
+++ ruby_1_8/version.h	(revision 16851)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-04"
+#define RUBY_RELEASE_DATE "2008-06-06"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080604
+#define RUBY_RELEASE_CODE 20080606
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 6
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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