Merge pull request #186 from signalwire/assert

andywolk · web-flow · commit 4f86f0b52e6a · 2024-01-10T01:12:49.000+03:00
WebSockets: move assert out of the loop in kws_read_frame()
diff --git a/src/kws.c b/src/kws.c
@@ -1465,8 +1465,9 @@ KS_DECLARE(ks_ssize_t) kws_read_frame(kws_t *kws, kws_opcode_t *oc, uint8_t **da
 				memcpy(kws->body, kws->payload, kws->rplen);
 			}
 
+			ks_assert((kws->body + kws->plen) <= (kws->bbuffer + kws->bbuflen));
+
 			while(need) {
-				ks_assert((kws->body + need + kws->rplen) <= (kws->bbuffer + kws->bbuflen));
 				ks_ssize_t r = kws_string_read(kws, kws->body + kws->rplen, need + 1, WS_BLOCK);
 
 				if (r < 1) {

Original file line number	Diff line number	Diff line change
`@@ -1465,8 +1465,9 @@ KS_DECLARE(ks_ssize_t) kws_read_frame(kws_t kws, kws_opcode_t oc, uint8_t **da`
`1465`	`1465`	`memcpy(kws->body, kws->payload, kws->rplen);`
`1466`	`1466`	`}`
`1467`	`1467`
	`1468`	`+ ks_assert((kws->body + kws->plen) <= (kws->bbuffer + kws->bbuflen));`
	`1469`	`+`
`1468`	`1470`	`while(need) {`
`1469`		`- ks_assert((kws->body + need + kws->rplen) <= (kws->bbuffer + kws->bbuflen));`
`1470`	`1471`	`ks_ssize_t r = kws_string_read(kws, kws->body + kws->rplen, need + 1, WS_BLOCK);`
`1471`	`1472`
`1472`	`1473`	`if (r < 1) {`