ruby/backport-0002-CVE-2024-35221.patch
2024-06-18 19:35:27 +08:00

41 lines
1.2 KiB
Diff

From 5dcc7a03267216feaa587017ef5d6d075b62f75b Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Fri, 9 Feb 2024 10:15:40 -0800
Subject: [PATCH] [rubygems/rubygems] Use a writer method on the module instead
of a constant
https://github.com/rubygems/rubygems/commit/240d84eea3
Reference:https://github.com/ruby/ruby/commit/5dcc7a03267216feaa587017ef5d6d075b62f75b
Conflict:Slightly different context
---
lib/rubygems/safe_yaml.rb | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/rubygems/safe_yaml.rb b/lib/rubygems/safe_yaml.rb
index 5ad256e..32c5309 100644
--- a/lib/rubygems/safe_yaml.rb
+++ b/lib/rubygems/safe_yaml.rb
@@ -26,12 +26,14 @@ module Gem
runtime
)
- ALIASES = true # :nodoc:
- private_constant :ALIASES
+ @aliases_enabled = true
+ def self.aliases_enabled=(value)
+ @aliases_enabled = !!value
+ end
if ::YAML.respond_to? :safe_load
def self.safe_load input
- ::YAML.safe_load(input, WHITELISTED_CLASSES, WHITELISTED_SYMBOLS, ALIASES)
+ ::YAML.safe_load(input, WHITELISTED_CLASSES, WHITELISTED_SYMBOLS, @aliases_enabled)
end
def self.load input
--
2.33.0