[master] e74fd16 Ensure bo is set should we panic in VBO_DerefBusyObj
Federico G. Schwindt
fgsch at lodoss.net
Mon Nov 17 13:55:05 CET 2014
commit e74fd16c06894238992eb03be612d4c7bee2d026
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Mon Nov 17 12:46:25 2014 +0000
Ensure bo is set should we panic in VBO_DerefBusyObj
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index cede109..3fae2bf 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -973,6 +973,6 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,
}
}
VSLb_ts_req(req, "Fetch", W_TIM_real(wrk));
- THR_SetBusyobj(NULL);
VBO_DerefBusyObj(wrk, &bo);
+ THR_SetBusyobj(NULL);
}
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 040f50d..1078d34 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -516,8 +516,8 @@ cnt_pipe(struct worker *wrk, struct req *req)
V1P_Process(req, bo);
http_Teardown(bo->bereq);
- THR_SetBusyobj(NULL);
VBO_DerefBusyObj(wrk, &bo);
+ THR_SetBusyobj(NULL);
return (REQ_FSM_DONE);
}
More information about the varnish-commit
mailing list