diff options
| -rw-r--r-- | lib/bundler.rb | 7 |
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) |