1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 15482:

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-06-15 10:19:52 +00:00
parent f08d1b2ee8
commit 0f2b4fbcd8
3 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Sun Jun 15 19:19:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org>
* configure.in (ftruncate): check if available.

View file

@ -423,8 +423,11 @@ iconv_convert
length = 0;
else if ((length -= start) < 0)
length = 0;
else
else {
inptr += start;
if (length > slen)
length = slen;
}
}
instart = inptr;
inlen = length;

View file

@ -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