From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Fri, 29 Feb 2008 09:38:49 +0000 (+0000)
Subject: Workaround: ignore uncached objects in EXP_Touch()
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2dc5a300ce77900785dbc382ed0930b6bcef935;p=varnish

Workaround: ignore uncached objects in EXP_Touch()


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2544 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index 677c2b2c..c9ddddcf 100644
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -198,6 +198,8 @@ EXP_Touch(const struct object *o, double now)
 
 	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 	oe = o->objexp;
+	if (oe == NULL)
+		return;
 	CHECK_OBJ_NOTNULL(oe, OBJEXP_MAGIC);
 	if (oe->lru_stamp + params->lru_timeout > now)
 		return;