From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 29 Jul 2013 00:33:43 +0000 (-0600)
Subject: Relaxed asserts because hits reading collapsed entries may have zero swap_file_sz.
X-Git-Tag: SQUID_3_5_0_1~444^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3587dde2ad87863cc9870e8f0556ce31a37cabc8;p=thirdparty%2Fsquid.git

Relaxed asserts because hits reading collapsed entries may have zero swap_file_sz.
---

diff --git a/src/store_client.cc b/src/store_client.cc
index 8007f78700..519c0d0e4b 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -597,10 +597,11 @@ store_client::unpackHeader(char const *buf, ssize_t len)
     storeSwapTLVFree(tlv_list);
 
     assert(swap_hdr_sz >= 0);
-    assert(entry->swap_file_sz > 0);
-    assert(entry->swap_file_sz >= static_cast<uint64_t>(swap_hdr_sz));
     entry->mem_obj->swap_hdr_sz = swap_hdr_sz;
-    entry->mem_obj->object_sz = entry->swap_file_sz - swap_hdr_sz;
+    if (entry->swap_file_sz > 0) { // collapsed hits may not know swap_file_sz
+        assert(entry->swap_file_sz >= static_cast<uint64_t>(swap_hdr_sz));
+        entry->mem_obj->object_sz = entry->swap_file_sz - swap_hdr_sz;
+    }
     debugs(90, 5, "store_client::unpackHeader: swap_file_sz=" <<
            entry->swap_file_sz << "( " << swap_hdr_sz << " + " <<
            entry->mem_obj->object_sz << ")");