[master] dee9dd0 Make sure we only decrement n_object when we truly deallocate an object.

Poul-Henning Kamp phk at FreeBSD.org
Tue Jan 7 23:35:18 CET 2014


commit dee9dd00c1bd00ebb84892495fd1b0e6ffce3dc7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jan 7 22:34:55 2014 +0000

    Make sure we only decrement n_object when we truly deallocate
    an object.

diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 68dbe61..e6f1dc4 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -792,9 +792,10 @@ HSH_DerefObjCore(struct dstat *ds, struct objcore **ocp)
 	BAN_DestroyObj(oc);
 	AZ(oc->ban);
 
-	if (oc->methods != NULL)
+	if (oc->methods != NULL) {
 		oc_freeobj(oc);
-	ds->n_object--;
+		ds->n_object--;
+	}
 	FREE_OBJ(oc);
 
 	ds->n_objectcore--;



More information about the varnish-commit mailing list