[master] a3cadf035 Remember to zero h2->mailcall on h2 rxbody vfp failure

Dag Haavi Finstad daghf at varnish-software.com
Tue Jul 3 14:11:08 UTC 2018


commit a3cadf0357dc2c39d78c4e72b934f517b867d974
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Tue Jul 3 16:05:00 2018 +0200

    Remember to zero h2->mailcall on h2 rxbody vfp failure
    
    Fixes: #2572

diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index f4cc294e5..3851089cd 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -835,8 +835,10 @@ h2_vfp_body_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
 		    H2SE_REFUSED_STREAM);
 		Lck_Lock(&h2->sess->mtx);
 		r2->error = H2SE_REFUSED_STREAM;
-		if (h2->mailcall == r2)
+		if (h2->mailcall == r2) {
+			h2->mailcall = NULL;
 			AZ(pthread_cond_signal(h2->cond));
+		}
 		Lck_Unlock(&h2->sess->mtx);
 	}
 }


More information about the varnish-commit mailing list