mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: htx: Fix block size calculation when a start-line is added/replaced

Browse Source 
What we store in the buffer is a union htx_sl, not an h1_sl, so the
computed size was not correct.
This commit is contained in:
Christopher Faulet 2018-11-26 15:02:30 +01:00 committed by Willy Tarreau
parent ed26fb8ac8
commit 53ad16a0ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/htx.c
View File

@ -617,7 +617,7 @@ struct htx_blk *htx_replace_reqline(struct htx *htx, struct htx_blk *blk,
if (type != HTX_BLK_REQ_SL) if (type != HTX_BLK_REQ_SL)
return NULL; return NULL;
size = sizeof(sl) + sl.rq.m.len + sl.rq.u.len + sl.rq.v.len; size = sizeof(union htx_sl) + sl.rq.m.len + sl.rq.u.len + sl.rq.v.len;
blk = htx_new_blk_value(htx, blk, size); blk = htx_new_blk_value(htx, blk, size);
if (!blk) if (!blk)
return NULL; return NULL;
@ -640,7 +640,7 @@ struct htx_blk *htx_replace_resline(struct htx *htx, struct htx_blk *blk,
if (type != HTX_BLK_RES_SL) if (type != HTX_BLK_RES_SL)
return NULL; return NULL;
size = sizeof(sl) + sl.rq.m.len + sl.rq.u.len + sl.rq.v.len; size = sizeof(union htx_sl) + sl.rq.m.len + sl.rq.u.len + sl.rq.v.len;
blk = htx_new_blk_value(htx, blk, size); blk = htx_new_blk_value(htx, blk, size);
if (!blk) if (!blk)
return NULL; return NULL;
@ -659,7 +659,7 @@ struct htx_blk *htx_add_reqline(struct htx *htx, const union h1_sl sl)
struct htx_blk *blk; struct htx_blk *blk;
uint32_t size; uint32_t size;
size = sizeof(sl) + sl.rq.m.len + sl.rq.u.len + sl.rq.v.len; size = sizeof(union htx_sl) + sl.rq.m.len + sl.rq.u.len + sl.rq.v.len;
/* FIXME: check size (< 256MB) */ /* FIXME: check size (< 256MB) */
blk = htx_add_blk(htx, HTX_BLK_REQ_SL, size); blk = htx_add_blk(htx, HTX_BLK_REQ_SL, size);
@ -679,7 +679,7 @@ struct htx_blk *htx_add_resline(struct htx *htx, const union h1_sl sl)
struct htx_blk *blk; struct htx_blk *blk;
uint32_t size; uint32_t size;
size = sizeof(sl) + sl.st.v.len + sl.st.c.len + sl.st.r.len; size = sizeof(union htx_sl) + sl.st.v.len + sl.st.c.len + sl.st.r.len;
/* FIXME: check size (< 256MB) */ /* FIXME: check size (< 256MB) */
blk = htx_add_blk(htx, HTX_BLK_RES_SL, size); blk = htx_add_blk(htx, HTX_BLK_RES_SL, size);