mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: mux-h2: use the correct offset for the HTX start line

Browse Source 
Due to a thinko, I used sl_off as the start line index number but it's
not it, it's its offset. The first index is obtained using htx_get_head(),
and the start line is obtained using htx_get_sline(). This caused crashes
to happen when forwarding HTX traffic via the H2 mux once the HTX buffer
started to wrap.

No backport is needed.
This commit is contained in:
Willy Tarreau 2018-12-06 14:07:27 +01:00
parent b2e841681a
commit 8e162ee1f9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mux_h2.c
View File

@ -3821,14 +3821,13 @@ static size_t h2s_htx_frt_make_resp_headers(struct h2s *h2s, struct htx *htx)
}
/* get the start line, we do have one */
blk = htx_get_blk(htx, htx->sl_off);
sl = htx_get_blk_ptr(htx, blk);
sl = htx_get_stline(htx);
h2s->status = sl->info.res.status;
/* and the rest of the headers, that we dump starting at header 0 */
hdr = 0;
idx = htx->sl_off;
idx = htx_get_head(htx); // returns the SL that we skip
while ((idx = htx_get_next(htx, idx)) != -1) {
blk = htx_get_blk(htx, idx);
type = htx_get_blk_type(blk);
@ -4047,15 +4046,14 @@ static size_t h2s_htx_bck_make_req_headers(struct h2s *h2s, struct htx *htx)
}
/* get the start line, we do have one */
blk = htx_get_blk(htx, htx->sl_off);
sl = htx_get_blk_ptr(htx, blk);
sl = htx_get_stline(htx);
meth = htx_sl_req_meth(sl);
path = htx_sl_req_uri(sl);
/* and the rest of the headers, that we dump starting at header 0 */
hdr = 0;
idx = htx->sl_off;
idx = htx_get_head(htx); // returns the SL that we skip
while ((idx = htx_get_next(htx, idx)) != -1) {
blk = htx_get_blk(htx, idx);
type = htx_get_blk_type(blk);