From 178c7e3390038581e6b4ed300679f8ab9d2bff58 Mon Sep 17 00:00:00 2001
From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Wed, 18 Dec 2013 15:32:14 -0700
Subject: [PATCH] Added StoreEntry::lock() call dropped when merging from trunk
 r13172.

---
 src/store_client.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/store_client.cc b/src/store_client.cc
index 092402094f..7e8e5d8927 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -720,6 +720,9 @@ storeUnregister(store_client * sc, StoreEntry * e, void *data)
     delete sc;
 
     assert(e->locked());
+    // An entry locked by others may be unlocked (and destructed) by others, so
+    // we must lock again to safely dereference e after CheckQuickAbort().
+    e->lock("storeUnregister");
 
     if (mem->nclients == 0)
         CheckQuickAbort(e);
@@ -730,7 +733,7 @@ storeUnregister(store_client * sc, StoreEntry * e, void *data)
     e->kickProducer();
 #endif
 
-    e->unlock(); // after the "++e->lock_count" above
+    e->unlock("storeUnregister");
     return 1;
 }
 
-- 
2.47.2