diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 12:24:21 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 12:24:21 +0000 |
| commit | 896d9fb9957f3c2d0a739e156f0775faa326d13c (patch) | |
| tree | 7c26aa04264eee89e98b850c14d2d74d9e9af946 /vsnprintf.c | |
| parent | 75b1146985c30a4981c55e2d3e5458c686c63fe6 (diff) | |
merge revision(s) 58210: [Backport #8916]
vsnprintf.c: prefix with precision
* vsnprintf.c (BSD_vfprintf): sign and hex-prefix should not be
counted in precision. [ruby-dev:47714] [Bug #8916]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vsnprintf.c')
| -rw-r--r-- | vsnprintf.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vsnprintf.c b/vsnprintf.c index 075bb4b2fe..0af1f5a573 100644 --- a/vsnprintf.c +++ b/vsnprintf.c @@ -1117,11 +1117,11 @@ number: if ((dprec = prec) >= 0) */ fieldsz = size; long_len: + realsz = dprec > fieldsz ? dprec : fieldsz; if (sign) - fieldsz++; + realsz++; if (flags & HEXPREFIX) - fieldsz += 2; - realsz = dprec > fieldsz ? dprec : fieldsz; + realsz += 2; /* right-adjusting blank padding */ if ((flags & (LADJUST|ZEROPAD)) == 0) @@ -1143,10 +1143,6 @@ long_len: /* leading zeroes from decimal precision */ PAD_L(dprec - fieldsz, zeroes); - if (sign) - fieldsz--; - if (flags & HEXPREFIX) - fieldsz -= 2; /* the string or number proper */ #ifdef FLOATING_POINT |