BUG/MINOR: mux-h1: avoid copying output over itself in zero-copy
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>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index a5d60c3..d928cef 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1658,7 +1658,7 @@
/* 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);