diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | test/ruby/test_sprintf.rb | 2 | ||||
| -rw-r--r-- | vsnprintf.c | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Tue Oct 19 12:19:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vsnprintf.c (BSD_vfprintf): fix over-count of field size. + Tue Oct 19 03:08:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * vsnprintf.c (BSD_vfprintf): use HEXPREFIX flag for prefix of %a. diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb index 3de1cbc1b5..631328ea0a 100644 --- a/test/ruby/test_sprintf.rb +++ b/test/ruby/test_sprintf.rb @@ -219,6 +219,8 @@ class TestSprintf < Test::Unit::TestCase assert_equal("-0x01.2p+0", sprintf("%010a", -1.125), bug3962) assert_equal("-0x01.1p+0", sprintf("%010a", -1.0625), bug3962) assert_equal("-0x1.08p+0", sprintf("%010a", -1.03125), bug3962) + assert_equal("0x000000000000001p+0", sprintf("%020a", 1), bug3962) + assert_equal("-0x00000000000001p+0", sprintf("%020a", -1), bug3962) end BSIZ = 120 diff --git a/vsnprintf.c b/vsnprintf.c index 9c15a4b7b6..c0853389c6 100644 --- a/vsnprintf.c +++ b/vsnprintf.c @@ -831,7 +831,6 @@ fp_begin: _double = va_arg(ap, double); expsize = exponent(expstr, expt, ch + 'p' - 'a'); ch += 'x' - 'a'; size = expsize + ndig; - size += 2; /* 0x */ if (ndig > 1) ++size; /* floating point */ } @@ -1028,7 +1027,7 @@ number: if ((dprec = prec) >= 0) long_len: if (sign) fieldsz++; - else if (flags & HEXPREFIX) + if (flags & HEXPREFIX) fieldsz += 2; realsz = dprec > fieldsz ? dprec : fieldsz; |