From d7bdcb874bcbd82737e51f080b9b0092863399f9 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 24 Sep 2015 16:33:10 +0200 Subject: [PATCH] BUG/MEDIUM: payload: make req.payload and payload_lv aware of dynamic buffers Due to a check between offset+len and buf->size, an empty buffer returns "will never match". Check against tune.bufsize instead. (cherry picked from commit 43e4039fd5d208fd9d32157d20de93d3ddf9bc0d) --- src/payload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/payload.c b/src/payload.c index 378927a7d..71d3ec00f 100644 --- a/src/payload.c +++ b/src/payload.c @@ -670,7 +670,7 @@ smp_fetch_payload_lv(const struct arg *arg_p, struct sample *smp, const char *kw buf_offset = arg_p[2].data.sint >> 1; } - if (!buf_size || buf_size > chn->buf->size || buf_offset + buf_size > chn->buf->size) { + if (!buf_size || buf_size > global.tune.bufsize || buf_offset + buf_size > global.tune.bufsize) { /* will never match */ smp->flags = 0; return 0; @@ -702,7 +702,7 @@ smp_fetch_payload(const struct arg *arg_p, struct sample *smp, const char *kw, v if (!chn->buf) return 0; - if (buf_size > chn->buf->size || buf_offset + buf_size > chn->buf->size) { + if (!buf_size || buf_size > global.tune.bufsize || buf_offset + buf_size > global.tune.bufsize) { /* will never match */ smp->flags = 0; return 0;