From fe90e83b482b7df84f6f1c7be70155df46dd4d3c Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Sun, 20 Aug 2023 22:44:43 -0700 Subject: [PATCH] [rubygems/rubygems] Use safe_load in bundler when available https://github.com/rubygems/rubygems/commit/34d096e38a --- lib/bundler.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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)