From 376c87b62ee0b38bb4f157288a6fbc32d2acae32 Mon Sep 17 00:00:00 2001
From: Florian Weingarten <flo@hackvalue.de>
Date: Tue, 19 May 2015 15:51:55 +0000
Subject: [PATCH] Don't crash when reading/writing Marshal

---
 lib/jekyll/regenerator.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 8ddfa269..c452c54d 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -130,7 +130,7 @@ module Jekyll
     #
     # Returns nothing.
     def write_metadata
-      File.open(metadata_file, 'w') do |f|
+      File.open(metadata_file, 'wb') do |f|
         f.write(Marshal.dump(metadata))
       end
     end
@@ -164,6 +164,9 @@ module Jekyll
           Marshal.load(content)
         rescue TypeError
           SafeYAML.load(content)
+        rescue ArgumentError => e
+          Jekyll.logger.warn("Failed to load #{metadata_file}: #{e}")
+          {}
         end
       else
         {}