diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-24 02:43:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-24 02:43:34 +0000 |
| commit | f3de12aa6bf81acd47282f60aef2bb1da583134a (patch) | |
| tree | 3c0c23f4a2b55d04f2cbe3492209efb38d0c5d30 | |
| parent | aeb0be6ad5a7d756a2ebe41ab2eb6639c2b976b3 (diff) | |
| download | ruby-f3de12aa6bf81acd47282f60aef2bb1da583134a.tar.gz | |
strftime.c: fix false failure
* strftime.c (rb_strftime_with_timespec): remove unnecessary
check, as `s` equals to `endp` when recursed STRFTIME resized
the capacity same as the size.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | strftime.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_time.rb | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Mar 24 11:43:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * strftime.c (rb_strftime_with_timespec): remove unnecessary + check, as `s` equals to `endp` when recursed STRFTIME resized + the capacity same as the size. + Wed Mar 23 21:48:00 2016 Kenta Murata <mrkn@mrkn.jp> * enum.c (ary_inject_op): put subtract operation out of if-clause. diff --git a/strftime.c b/strftime.c index a426a455bd..f532bb0ac6 100644 --- a/strftime.c +++ b/strftime.c @@ -851,7 +851,7 @@ rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len, } } } - if (s >= endp || format != format_end) { + if (format != format_end) { return 0; } len = s - start; diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 71f2756216..3e7d9613ed 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -651,6 +651,8 @@ class TestTime < Test::Unit::TestCase assert_equal("UTC", t2000.strftime("%Z")) assert_equal("%", t2000.strftime("%%")) assert_equal("0", t2000.strftime("%-S")) + assert_equal("12:00:00 AM", t2000.strftime("%r")) + assert_equal("Sat 2000-01-01T00:00:00", t2000.strftime("%3a %FT%T")) assert_equal("", t2000.strftime("")) assert_equal("foo\0bar\x0000\x0000\x0000", t2000.strftime("foo\0bar\0%H\0%M\0%S")) |