archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 52869: [Backport #11766]

Browse source 
* sprintf.c (rb_str_format): fix wrong shifting position in
	  Rational conversion when not at the beginning of the result.
	  [ruby-core:71806] [Bug #11766]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-12-03 19:55:23 +00:00
parent c35409c276
commit f50d0b98bd
4 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sprintf.c
View file

@ -1095,16 +1095,19 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
done += prec;
}
if ((flags & FWIDTH) && width > done) {
int fill = ' ';
long shifting = 0;
if (!(flags&FMINUS)) {
long i, shifting = (flags&FZERO) ? done - prefix : done;
for (i = 1; i <= shifting; i++)
buf[width - i] = buf[done - i];
shifting = done;
if (flags&FZERO) {
shifting -= prefix;
fill = '0';
}
blen -= shifting;
FILL((flags&FZERO) ? '0' : ' ', width - done);
blen += shifting;
} else {
FILL(' ', width - done);
memmove(&buf[blen + width - done], &buf[blen], shifting);
}
FILL(fill, width - done);
blen += shifting;
}
RB_GC_GUARD(val);
break;