shyouhei	2008-07-02 17:41:13 +0900 (Wed, 02 Jul 2008)

  New Revision: 17791

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

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



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

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

Index: ruby_1_8_6/ext/iconv/iconv.c
===================================================================
--- ruby_1_8_6/ext/iconv/iconv.c	(revision 17790)
+++ ruby_1_8_6/ext/iconv/iconv.c	(revision 17791)
@@ -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_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17790)
+++ ruby_1_8_6/ChangeLog	(revision 17791)
@@ -1,3 +1,8 @@
+Wed Jul  2 17:38:01 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
+	  [ruby-core:17115]
+
 Tue Jul  1 15:09:37 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_fill): check if beg is too big.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17790)
+++ ruby_1_8_6/version.h	(revision 17791)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-07-01"
+#define RUBY_RELEASE_DATE "2008-07-02"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080701
-#define RUBY_PATCHLEVEL 257
+#define RUBY_RELEASE_CODE 20080702
+#define RUBY_PATCHLEVEL 258
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 2
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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