RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-04 11:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: mux-h1: avoid copying output over itself in zero-copy

Browse Source 
It's almost funny but one side effect of the latest zero-copy changes made
to mux-h1 resulted in the temporary buffer being copied over itself at the
exact same location. This has no impact except slowing down operations and
irritating valgrind. The cause is an incorrect pointer check after the
alignment optimizations were made.

This needs to be backported to 1.9.

Reported-by: Tim Duesterhus <tim@bastelstu.be>
This commit is contained in:
Willy Tarreau 2019-01-23 20:43:53 +01:00
parent afe57846bf
commit b57af617c0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mux_h1.c
View File

@ -1658,7 +1658,7 @@ static size_t h1_process_output(struct h1c *h1c, struct buffer *buf, size_t coun
/* when the output buffer is empty, tmp shares the same area so that we
* only have to update pointers and lengths.
*/
if (tmp->area == h1c->obuf.area)
if (tmp->area == h1c->obuf.area + h1c->obuf.head)
h1c->obuf.data = tmp->data;
else
b_putblk(&h1c->obuf, tmp->area, tmp->data);