shyouhei	2008-06-15 19:19:52 +0900 (Sun, 15 Jun 2008)

  New Revision: 17175

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

  Log:
    merge revision(s) 15482:
    * ext/iconv/iconv.c (iconv_convert): check upper bound.  a patch from
      Daniel Luz at [ruby-Bugs-17910].


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

Index: ruby_1_8_5/ext/iconv/iconv.c
===================================================================
--- ruby_1_8_5/ext/iconv/iconv.c	(revision 17174)
+++ ruby_1_8_5/ext/iconv/iconv.c	(revision 17175)
@@ -423,8 +423,11 @@
 	    length = 0;
 	else if ((length -= start) < 0)
 	    length = 0;
-	else
+	else {
 	    inptr += start;
+	    if (length > slen)
+		length = slen;
+	}
     }
     instart = inptr;
     inlen = length;
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17174)
+++ ruby_1_8_5/ChangeLog	(revision 17175)
@@ -1,3 +1,8 @@
+Sun Jun 15 19:19:21 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/iconv/iconv.c (iconv_convert): check upper bound.  a patch from
+	  Daniel Luz at [ruby-Bugs-17910].
+
 Sun Jun 15 19:07:41 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (ftruncate): check if available.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17174)
+++ ruby_1_8_5/version.h	(revision 17175)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 177
+#define RUBY_PATCHLEVEL 178
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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