abstract Marshal.load failures

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 791a71cb..61fb7a07 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -81,6 +81,7 @@ module Bundler
   end
 
   class InvalidSpecSet < StandardError; end
+  class MarshalError   < StandardError; end
 
   class << self
     attr_writer :ui, :bundle_path
@@ -284,6 +285,12 @@ module Bundler
       File.open(file, "rb") { |f| f.read }
     end
 
+    def load_marshal(data)
+      Marshal.load(data)
+    rescue => e
+      raise MarshalError, "#{e.class}: #{e.message}"
+    end
+
     def load_gemspec(file)
       @gemspec_cache ||= {}
       key = File.expand_path(file)