RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-25 14:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: htx: Set the right start-line offset after a defrag

Browse Source 
The offset was always wrong after an HTX defragmentation because the wrong
address was used and because the update could occcur several time on the same
defragmentation.
This commit is contained in:
Christopher Faulet 2018-12-06 14:31:12 +01:00 committed by Willy Tarreau
parent 27f3fa56f5
commit 174bfb163c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/htx.c
View File

@ -28,6 +28,7 @@ struct htx_blk *htx_defrag(struct htx *htx, struct htx_blk *blk)
struct htx_blk *newblk, *oldblk;
uint32_t new, old;
uint32_t addr, blksz;
int32_t sl_off = -1;
if (!htx->used)
return NULL;
@ -49,19 +50,20 @@ struct htx_blk *htx_defrag(struct htx *htx, struct htx_blk *blk)
newblk->info = oldblk->info;
blksz = htx_get_blksz(oldblk);
/* update the start-line offset */
if (htx->sl_off == oldblk->addr)
sl_off = addr;
memcpy((void *)tmp->blocks + addr, htx_get_blk_ptr(htx, oldblk), blksz);
new++;
addr += blksz;
/* update the start-line offset */
if (htx->sl_off == oldblk->addr)
htx->sl_off = addr;
/* if <blk> is defined, set its new location */
if (blk != NULL && blk == oldblk)
blk = newblk;
} while (new < htx->used);
htx->sl_off = sl_off;
htx->wrap = htx->used;
htx->front = htx->tail = new - 1;
memcpy((void *)htx->blocks, (void *)tmp->blocks, htx->size);