nobu	2008-02-15 15:23:14 +0900 (Fri, 15 Feb 2008)

  New Revision: 15482

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/iconv/iconv.c
    trunk/ChangeLog
    trunk/ext/iconv/iconv.c

  Log:
    * 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/trunk/ext/iconv/iconv.c?r1=15482&r2=15481&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15482&r2=15481&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15482&r2=15481&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/iconv/iconv.c?r1=15482&r2=15481&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15481)
+++ ChangeLog	(revision 15482)
@@ -1,3 +1,8 @@
+Fri Feb 15 15:23:12 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/iconv/iconv.c (iconv_convert): check upper bound.  a patch from
+	  Daniel Luz at [ruby-Bugs-17910].
+
 Fri Feb 15 10:35:54 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* re.c (rb_reg_quote): set US-ACII for ASCII-only string.
Index: ext/iconv/iconv.c
===================================================================
--- ext/iconv/iconv.c	(revision 15481)
+++ ext/iconv/iconv.c	(revision 15482)
@@ -380,8 +380,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/ext/iconv/iconv.c
===================================================================
--- ruby_1_8/ext/iconv/iconv.c	(revision 15481)
+++ ruby_1_8/ext/iconv/iconv.c	(revision 15482)
@@ -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/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15481)
+++ ruby_1_8/ChangeLog	(revision 15482)
@@ -1,3 +1,8 @@
+Fri Feb 15 15:23:12 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/iconv/iconv.c (iconv_convert): check upper bound.  a patch from
+	  Daniel Luz at [ruby-Bugs-17910].
+
 Fri Feb 15 02:42:25 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (ftruncate): check if available.

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