mirror of
https://git.yoctoproject.org/poky
synced 2026-02-13 04:03:03 +01:00
be5ebd6b3f
Upstream-Status: Backport from 957bb7cb81
(From OE-Core rev: 0f8eb0505e19ccd27e1b91f27285a9fc87f2aa93)
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
74 lines
2.3 KiB
Diff
74 lines
2.3 KiB
Diff
From 957bb7cb81995f26c671afce0ee50a5c660e540e Mon Sep 17 00:00:00 2001
|
|
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
|
|
Date: Wed, 29 Mar 2023 13:28:25 +0900
|
|
Subject: [PATCH] CVE-2023-28756
|
|
|
|
CVE: CVE-2023-28756
|
|
Upstream-Status: Backport [https://github.com/ruby/ruby/commit/957bb7cb81995f26c671afce0ee50a5c660e540e]
|
|
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
|
---
|
|
lib/time.gemspec | 2 +-
|
|
lib/time.rb | 6 +++---
|
|
test/test_time.rb | 9 +++++++++
|
|
3 files changed, 13 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/time.gemspec b/lib/time.gemspec
|
|
index 72fba34..bada91a 100644
|
|
--- a/lib/time.gemspec
|
|
+++ b/lib/time.gemspec
|
|
@@ -1,6 +1,6 @@
|
|
Gem::Specification.new do |spec|
|
|
spec.name = "time"
|
|
- spec.version = "0.2.0"
|
|
+ spec.version = "0.2.2"
|
|
spec.authors = ["Tanaka Akira"]
|
|
spec.email = ["akr@fsij.org"]
|
|
|
|
diff --git a/lib/time.rb b/lib/time.rb
|
|
index bd20a1a..6a13212 100644
|
|
--- a/lib/time.rb
|
|
+++ b/lib/time.rb
|
|
@@ -509,8 +509,8 @@ class Time
|
|
(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+
|
|
(\d{2,})\s+
|
|
(\d{2})\s*
|
|
- :\s*(\d{2})\s*
|
|
- (?::\s*(\d{2}))?\s+
|
|
+ :\s*(\d{2})
|
|
+ (?:\s*:\s*(\d\d))?\s+
|
|
([+-]\d{4}|
|
|
UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[A-IK-Z])/ix =~ date
|
|
# Since RFC 2822 permit comments, the regexp has no right anchor.
|
|
@@ -701,7 +701,7 @@ class Time
|
|
#
|
|
# If self is a UTC time, Z is used as TZD. [+-]hh:mm is used otherwise.
|
|
#
|
|
- # +fractional_digits+ specifies a number of digits to use for fractional
|
|
+ # +fraction_digits+ specifies a number of digits to use for fractional
|
|
# seconds. Its default value is 0.
|
|
#
|
|
# require 'time'
|
|
diff --git a/test/test_time.rb b/test/test_time.rb
|
|
index b50d841..23e8e10 100644
|
|
--- a/test/test_time.rb
|
|
+++ b/test/test_time.rb
|
|
@@ -62,6 +62,15 @@ class TestTimeExtension < Test::Unit::TestCase # :nodoc:
|
|
assert_equal(true, t.utc?)
|
|
end
|
|
|
|
+ def test_rfc2822_nonlinear
|
|
+ pre = ->(n) {"0 Feb 00 00 :00" + " " * n}
|
|
+ assert_linear_performance([100, 500, 5000, 50_000], pre: pre) do |s|
|
|
+ assert_raise(ArgumentError) do
|
|
+ Time.rfc2822(s)
|
|
+ end
|
|
+ end
|
|
+ end
|
|
+
|
|
if defined?(Ractor)
|
|
def test_rfc2822_ractor
|
|
assert_ractor(<<~RUBY, require: 'time')
|
|
--
|
|
2.25.1
|
|
|