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

sprintf.c: integer overflow

Browse source 
* sprintf.c (rb_str_format): fix a possible integer overflow and
  suppress implicit conversion warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-09-16 02:44:04 +00:00
parent 279086dd61
commit 57a1688743
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sprintf.c
View file

@ -1026,8 +1026,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
{ {
VALUE val = GETARG(), num, den; VALUE val = GETARG(), num, den;
int sign = (flags&FPLUS) ? 1 : 0, zero = 0; int sign = (flags&FPLUS) ? 1 : 0, zero = 0;
long len; long len, done = 0;
int i, done = 0, prefix = 0; int prefix = 0;
if (!RB_TYPE_P(val, T_RATIONAL)) { if (!RB_TYPE_P(val, T_RATIONAL)) {
nextvalue = val; nextvalue = val;
goto float_value; goto float_value;
@ -1100,7 +1100,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
} }
if ((flags & FWIDTH) && width > done) { if ((flags & FWIDTH) && width > done) {
if (!(flags&FMINUS)) { if (!(flags&FMINUS)) {
int shifting = (flags&FZERO) ? done - prefix : done; long i, shifting = (flags&FZERO) ? done - prefix : done;
for (i = 1; i <= shifting; i++) for (i = 1; i <= shifting; i++)
buf[width - i] = buf[done - i]; buf[width - i] = buf[done - i];
blen -= shifting; blen -= shifting;