[6.0] 0b275eb76 For rollback, NULL additional pointers which could point to workspace

Reza Naghibi reza at naghibi.com
Tue Jun 16 15:59:09 UTC 2020


commit 0b275eb765978209d061ae725c9809300a18eb56
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Apr 14 11:07:40 2020 +0200

    For rollback, NULL additional pointers which could point to workspace
    
     Conflicts:
            bin/varnishd/cache/cache_fetch.c
            bin/varnishd/cache/cache_req.c

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 47cc8fd79..d151298c1 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -107,6 +107,7 @@ void Bereq_Rollback(struct busyobj *bo)
 	VCL_TaskLeave(bo->vcl, bo->privs);
 	VCL_TaskEnter(bo->vcl, bo->privs);
 	HTTP_Copy(bo->bereq, bo->bereq0);
+	bo->err_reason = NULL;
 	WS_Reset(bo->bereq->ws, bo->ws_bo);
 	WS_Reset(bo->ws, bo->ws_bo);
 }


More information about the varnish-commit mailing list