mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 00:57:02 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MAJOR: htx: Return the good block address after a defrag

Browse Source 
When an HTX structure is defragmented, it is possible to retrieve the new block
corresponding to an old one. This is useful to do a defrag during a loop on
blocks, to be sure to continue looping on the good block. But, instead of
returning the address of the new block in the HTX structure, the one in the
temporary structure used to do the defrag was returned, leading to unexpected
behaviours.

This patch must be backported to 1.9.
This commit is contained in:
Christopher Faulet 2019-01-02 11:23:44 +01:00 committed by Willy Tarreau
parent 6112391f81
commit 200f895cca
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/htx.c
View File

@ -26,13 +26,15 @@ struct htx_blk *htx_defrag(struct htx *htx, struct htx_blk *blk)
struct buffer *chunk = get_trash_chunk(); struct buffer *chunk = get_trash_chunk();
struct htx *tmp = htxbuf(chunk); struct htx *tmp = htxbuf(chunk);
struct htx_blk *newblk, *oldblk; struct htx_blk *newblk, *oldblk;
uint32_t new, old; uint32_t new, old, blkpos;
uint32_t addr, blksz; uint32_t addr, blksz;
int32_t sl_off = -1; int32_t sl_off = -1;
if (!htx->used) if (!htx->used)
return NULL; return NULL;
blkpos = -1;
new = 0; new = 0;
addr = 0; addr = 0;
tmp->size = htx->size; tmp->size = htx->size;
@ -54,13 +56,14 @@ struct htx_blk *htx_defrag(struct htx *htx, struct htx_blk *blk)
if (htx->sl_off == oldblk->addr) if (htx->sl_off == oldblk->addr)
sl_off = addr; sl_off = addr;
/* if <blk> is defined, set its new position */
if (blk != NULL && blk == oldblk)
blkpos = new;
memcpy((void *)tmp->blocks + addr, htx_get_blk_ptr(htx, oldblk), blksz); memcpy((void *)tmp->blocks + addr, htx_get_blk_ptr(htx, oldblk), blksz);
new++; new++;
addr += blksz; addr += blksz;
/* if <blk> is defined, set its new location */
if (blk != NULL && blk == oldblk)
blk = newblk;
} while (new < htx->used); } while (new < htx->used);
htx->sl_off = sl_off; htx->sl_off = sl_off;
@ -68,7 +71,7 @@ struct htx_blk *htx_defrag(struct htx *htx, struct htx_blk *blk)
htx->front = htx->tail = new - 1; htx->front = htx->tail = new - 1;
memcpy((void *)htx->blocks, (void *)tmp->blocks, htx->size); memcpy((void *)htx->blocks, (void *)tmp->blocks, htx->size);
return blk; return ((blkpos == -1) ? NULL : htx_get_blk(htx, blkpos));
} }
/* Reserves a new block in the HTTP message <htx> with a content of <blksz> /* Reserves a new block in the HTTP message <htx> with a content of <blksz>