diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 22:44:23 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 22:44:23 +0000 |
commit | b98aa3aaaee29f86518cf3b70f3611bdc346ea17 (patch) | |
tree | 7377405abd520a3c8c781e42c573e98e2bfbf2d3 | |
parent | febd8c91f63d53b38c3998567a45e3fc28c6bc58 (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
-rw-r--r-- | strftime.c | 2 | ||||
-rw-r--r-- | test/ruby/test_time.rb | 7 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 1 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; \ diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 2bd4bc8455..6a55af139f 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -851,6 +851,13 @@ class TestTime < Test::Unit::TestCase assert_equal(8192, Time.now.strftime('%8192z').size) end + def test_strftime_wide_precision + t2000 = get_t2000 + s = t2000.strftime("%28c") + assert_equal(28, s.size) + assert_equal(t2000.strftime("%c"), s.strip) + end + def test_strfimte_zoneoffset t2000 = get_t2000 t = t2000.getlocal("+09:00:00") @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.7" #define RUBY_RELEASE_DATE "2021-04-05" -#define RUBY_PATCHLEVEL 175 +#define RUBY_PATCHLEVEL 176 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 4 |