aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2023-08-20 22:44:43 -0700
committergit <svn-admin@ruby-lang.org>2023-09-20 02:03:01 +0000
commitfe90e83b482b7df84f6f1c7be70155df46dd4d3c (patch)
tree880b27365b20ab5e9b96cdda2202921c2617dda9
parent7c6b500d8d5fad568780b21cc6a1deb3aa57e746 (diff)
downloadruby-fe90e83b482b7df84f6f1c7be70155df46dd4d3c.tar.gz
[rubygems/rubygems] Use safe_load in bundler when available
https://github.com/rubygems/rubygems/commit/34d096e38a
-rw-r--r--lib/bundler.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb
index f83268e9cd..85929c56aa 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -515,7 +515,12 @@ EOF
end
def safe_load_marshal(data)
- load_marshal(data, :marshal_proc => SafeMarshal.proc)
+ if Gem.respond_to?(:load_safe_marshal)
+ Gem.load_safe_marshal
+ Gem::SafeMarshal.safe_load(data)
+ else
+ load_marshal(data, :marshal_proc => SafeMarshal.proc)
+ end
end
def load_gemspec(file, validate = false)