From 896d9fb9957f3c2d0a739e156f0775faa326d13c Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 30 Jun 2017 12:24:21 +0000 Subject: 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 --- strftime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'strftime.c') diff --git a/strftime.c b/strftime.c index 83550e9a7f..e8099a3f12 100644 --- a/strftime.c +++ b/strftime.c @@ -497,7 +497,7 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi 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) = '-'; -- cgit v1.2.3