diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-03 06:33:13 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-03 06:33:13 +0000 |
commit | 77e9edc3348f33904424ceaa14e9692b8b91d7f3 (patch) | |
tree | 4cc7a6af54afd5f8a38a1bdead524f160dd69e8b /sprintf.c | |
parent | f7fb4e00f721a9d0520b0bbeab687d122f6759ff (diff) | |
download | ruby-77e9edc3348f33904424ceaa14e9692b8b91d7f3.tar.gz |
sprintf.c: fix garbage inserted with Rational
* 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/trunk@52869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'sprintf.c')
-rw-r--r-- | sprintf.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -1107,16 +1107,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; |