[master] fe1ebfe Add a bunch of asserts to try to catch #2539

Poul-Henning Kamp phk at FreeBSD.org
Thu Jan 18 09:18:06 UTC 2018


commit fe1ebfe42d559f17f798d19b03db95a75fd469c0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Jan 18 09:16:33 2018 +0000

    Add a bunch of asserts to try to catch #2539

diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index e76b0b2..599f908 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -326,15 +326,21 @@ h2_new_session(struct worker *wrk, void *arg)
 	assert(HTC_S_COMPLETE == H2_prism_complete(h2->htc));
 	HTC_RxPipeline(h2->htc, h2->htc->rxbuf_b + sizeof(H2_prism));
 	HTC_RxInit(h2->htc, h2->ws);
+	AN(h2->ws->r);
 	VSLb(h2->vsl, SLT_Debug, "H2: Got pu PRISM");
 
 	THR_SetRequest(h2->srq);
+	AN(h2->ws->r);
 
 	l = h2_enc_settings(&h2->local_settings, settings, sizeof (settings));
+	AN(h2->ws->r);
 	H2_Send_Get(wrk, h2, h2->req0);
+	AN(h2->ws->r);
 	H2_Send_Frame(wrk, h2,
 	    H2_F_SETTINGS, H2FF_NONE, l, 0, settings);
+	AN(h2->ws->r);
 	H2_Send_Rel(h2, h2->req0);
+	AN(h2->ws->r);
 
 	/* and off we go... */
 	h2->cond = &wrk->cond;
@@ -347,6 +353,7 @@ h2_new_session(struct worker *wrk, void *arg)
 			h2->error = H2CE_INTERNAL_ERROR;
 			break;
 		}
+		AN(h2->ws->r);
 	}
 
 	AN(h2->error);


More information about the varnish-commit mailing list