From: Sage Weil <sage@inktank.com>
Date: Tue, 11 Feb 2014 03:04:35 +0000 (-0800)
Subject: memstore: fix touch double-allocation
X-Git-Tag: v0.77~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1211%2Fhead;p=ceph.git

memstore: fix touch double-allocation

Reported-by: Allen Samuels <allen.samuels@sandisk.com>
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/os/MemStore.cc b/src/os/MemStore.cc
index fd6a7d5a90c..c7361870039 100644
--- a/src/os/MemStore.cc
+++ b/src/os/MemStore.cc
@@ -1012,8 +1012,9 @@ int MemStore::_touch(coll_t cid, const ghobject_t& oid)
 
   ObjectRef o = c->get_object(oid);
   if (!o) {
-    c->object_map[oid].reset(new Object);
-    c->object_hash[oid].reset(new Object);
+    o.reset(new Object);
+    c->object_map[oid] = o;
+    c->object_hash[oid] = o;
   }
   return 0;
 }