From 948c3c8bd5ece92aa5faf589339e979d47cdfee7 Mon Sep 17 00:00:00 2001
From: Jonathan Hyman <jon@braze.com>
Date: Mon, 16 Sep 2019 08:37:59 -0400
Subject: [PATCH] Fixes #36956 by dup'ing the value and entry object returned
 from MemoryStore.

---
 .../lib/active_support/cache/memory_store.rb  |  2 ++
 .../test/cache/stores/memory_store_test.rb    | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/activesupport/lib/active_support/cache/memory_store.rb b/activesupport/lib/active_support/cache/memory_store.rb
index fa24da91b46..9d257fce367 100644
--- a/activesupport/lib/active_support/cache/memory_store.rb
+++ b/activesupport/lib/active_support/cache/memory_store.rb
@@ -124,6 +124,8 @@ module ActiveSupport
           entry = @data[key]
           synchronize do
             if entry
+              entry = entry.dup
+              entry.dup_value!
               @key_access[key] = Time.now.to_f
             else
               @key_access.delete(key)
diff --git a/activesupport/test/cache/stores/memory_store_test.rb b/activesupport/test/cache/stores/memory_store_test.rb
index 4c0a4f549d0..59764d45a3c 100644
--- a/activesupport/test/cache/stores/memory_store_test.rb
+++ b/activesupport/test/cache/stores/memory_store_test.rb
@@ -107,6 +107,36 @@ class MemoryStorePruningTest < ActiveSupport::TestCase
     assert_not @cache.exist?(1)
   end
 
+  def test_cache_not_mutated
+    item = { "foo" => "bar" }
+    key = "test_key"
+    @cache.write(key, item)
+
+    read_item = @cache.read(key)
+    read_item["foo"] = "xyz"
+    assert_equal item, @cache.read(key)
+  end
+
+  def test_cache_different_object_ids_hash
+    item = { "foo" => "bar" }
+    key = "test_key"
+    @cache.write(key, item)
+
+    read_item = @cache.read(key)
+    assert_not_equal item.object_id, read_item.object_id
+    assert_not_equal read_item.object_id, @cache.read(key).object_id
+  end
+
+  def test_cache_different_object_ids_string
+    item = "my_string"
+    key = "test_key"
+    @cache.write(key, item)
+
+    read_item = @cache.read(key)
+    assert_not_equal item.object_id, read_item.object_id
+    assert_not_equal read_item.object_id, @cache.read(key).object_id
+  end
+
   def test_write_with_unless_exist
     assert_equal true, @cache.write(1, "aaaaaaaaaa")
     assert_equal false, @cache.write(1, "aaaaaaaaaa", unless_exist: true)