summaryrefslogtreecommitdiff
path: root/strftime.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2021-04-04 22:44:23 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2021-04-04 22:44:23 +0000
commitb98aa3aaaee29f86518cf3b70f3611bdc346ea17 (patch)
tree7377405abd520a3c8c781e42c573e98e2bfbf2d3 /strftime.c
parentfebd8c91f63d53b38c3998567a45e3fc28c6bc58 (diff)
merge revision(s) 2f1895fa: [Backport #16767]
Fixed formatted substring expansion [Bug #16767] --- strftime.c | 2 ++ test/ruby/test_time.rb | 7 +++++++ 2 files changed, 9 insertions(+) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'strftime.c')
-rw-r--r--strftime.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/strftime.c b/strftime.c
index dd2b21f977..446be7d338 100644
--- a/strftime.c
+++ b/strftime.c
@@ -326,7 +326,9 @@ rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len,
s += len; \
if (i > 0) case_conv(s, i, flags); \
if (precision > i) {\
+ s += i; \
NEEDS(precision); \
+ s -= i; \
memmove(s + precision - i, s, i);\
memset(s, padding ? padding : ' ', precision - i); \
s += precision; \