From 1336844a7f3b30d21cc38eae32ad14e16a951e7d Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 3 Dec 2015 06:33:13 +0000 Subject: 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 --- sprintf.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'sprintf.c') diff --git a/sprintf.c b/sprintf.c index 99c97a01c0..84d5fd112b 100644 --- a/sprintf.c +++ b/sprintf.c @@ -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; -- cgit v1.2.3