Added StoreEntry::lock() call dropped when merging from trunk r13172.

diff --git a/src/store_client.cc b/src/store_client.cc
index 092402094f42fcf5c2c88b5add53eb30c2ccadb5..7e8e5d8927c23ae452ce37eef5e695e228551cdc 100644 (file)
--- 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;
 }