diff options
| -rw-r--r-- | strftime.c | 2 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | vsnprintf.c | 10 |
3 files changed, 5 insertions, 9 deletions
diff --git a/strftime.c b/strftime.c index 42e733818c..6bde70d72b 100644 --- a/strftime.c +++ b/strftime.c @@ -582,7 +582,7 @@ rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len, goto unknown; } i = snprintf(s, endp - s, (padding == ' ' ? "%+*ld" : "%+.*ld"), - precision + 1, sign * (off / 3600)); + precision + (padding == ' '), sign * (off / 3600)); if (i < 0) goto err; if (sign < 0 && off < 3600) { *(padding == ' ' ? s + i - 2 : s) = '-'; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-07-10" -#define RUBY_PATCHLEVEL 139 +#define RUBY_PATCHLEVEL 140 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 7 diff --git a/vsnprintf.c b/vsnprintf.c index 9a4f37abe0..f5652e7cec 100644 --- a/vsnprintf.c +++ b/vsnprintf.c @@ -1119,11 +1119,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) @@ -1145,10 +1145,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 |