From: wessels <> Date: Mon, 17 Aug 1998 22:50:39 +0000 (+0000) Subject: set e->mem_obj = NULL in the right place, destroy_MemObject() X-Git-Tag: SQUID_3_0_PRE1~2888 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41f7e38d0b43a7a8706d62fc509017069c4df39f;p=thirdparty%2Fsquid.git set e->mem_obj = NULL in the right place, destroy_MemObject() --- diff --git a/src/store.cc b/src/store.cc index 7509cc01ec..fe0aecb74b 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1,6 +1,6 @@ /* - * $Id: store.cc,v 1.440 1998/08/14 23:52:18 wessels Exp $ + * $Id: store.cc,v 1.441 1998/08/17 16:50:39 wessels Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -132,6 +132,7 @@ destroy_MemObject(StoreEntry * e) MemObject *mem = e->mem_obj; const Ctx ctx = ctx_enter(mem->url); debug(20, 3) ("destroy_MemObject: destroying %p\n", mem); + e->mem_obj = NULL; assert(mem->swapout.fd == -1); stmemFree(&mem->data_hdr); mem->inmem_hi = 0; @@ -205,7 +206,6 @@ storePurgeMem(StoreEntry * e) storeKeyText(e->key)); storeSetMemStatus(e, NOT_IN_MEMORY); destroy_MemObject(e); - e->mem_obj = NULL; if (e->swap_status != SWAPOUT_DONE) storeRelease(e); }