Fix arthurnn#88.

grosser · Jun 9, 2012 · 94f9188 · 94f9188
1 parent f5b7743
commit 94f9188
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+v1.4.2. Remove race from Marshal.load for any poor saps who have side-effects in their serialization mechanism (jason-o-matic).
+
 v1.4.1. Fix Memcached::Rails#servers bug (tomhughes).
 
 v1.4.0. Update Memcached::Rails compatibility wrapper to play along with Rails 3.2, including support for the horrendous ActiveSupport::Duration (tomhughes).

diff --git a/lib/memcached/memcached.rb b/lib/memcached/memcached.rb
@@ -499,12 +499,17 @@ def get(keys, marshal=true)
       value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
       while ret != 21 do # Lib::MEMCACHED_END
         if ret == 0 # Lib::MEMCACHED_SUCCESS
-          hash[key] = (marshal ? Marshal.load(value) : value)
+          hash[key] = value
         elsif ret != 16 # Lib::MEMCACHED_NOTFOUND
           check_return_code(ret, key)
         end
         value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
       end
+      if marshal
+        hash.each do |key, value|
+          hash[key] = Marshal.load(value)
+        end
+      end
       hash
     else
       # Single get