Add a couple of commits to try to catch #2257

bin/varnishd/cache/cache_req_fsm.c

@@ -1011,6 +1011,7 @@ CNT_Request(struct worker *wrk, struct req *req)
 		VRB_Free(req);
 		req->wrk = NULL;
 	}
+	assert(nxt == REQ_FSM_DISEMBARK || req->ws->r == NULL);
 	return (nxt);
 }
 

bin/varnishd/http2/cache_http2_proto.c

@@ -440,6 +440,7 @@ h2_do_req(struct worker *wrk, void *priv)
 	req->http->conds = 1;
 	if (CNT_Request(wrk, req) != REQ_FSM_DISEMBARK) {
 		VSL(SLT_Debug, 0, "H2REQ CNT done");
+		AZ(req->ws->r);
 		r2->state = H2_S_CLOSED;
 		h2_del_req(wrk, r2);
 	}