From c50ee0b3b4001300f47f77bbdc38b2991b76d663 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Mon, 24 Feb 2020 16:20:09 +0100 Subject: [PATCH] BUG/MINOR: filters: Use filter offset to decude the amount of forwarded data When the tcp or http payload is filtered, it is important to use the filter offset to decude the amount of forwarded data because this offset may change during the call to the callback function. So we should not rely on a local variable defined before this call. For now, existing HAproxy filters don't change this offset, so this bug may only affect external filters. This patch must be forwarded as far as 1.9. --- src/filters.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/filters.c b/src/filters.c index afe8c13d9..c4601febe 100644 --- a/src/filters.c +++ b/src/filters.c @@ -626,8 +626,8 @@ flt_http_payload(struct stream *s, struct http_msg *msg, unsigned int len) ret = FLT_OPS(filter)->http_payload(s, filter, msg, out + offset, data - offset); if (ret < 0) goto end; + data = ret + *flt_off - *strm_off; *flt_off += ret; - data = ret + offset; } } @@ -890,8 +890,8 @@ flt_tcp_payload(struct stream *s, struct channel *chn, unsigned int len) ret = FLT_OPS(filter)->tcp_payload(s, filter, chn, out + offset, data - offset); if (ret < 0) goto end; + data = ret + *flt_off - *strm_off; *flt_off += ret; - data = ret + offset; } }