upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-22 06:37:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

BUG/MINOR: tools: Fix loop condition in dump_text()

Browse source 
The condition should first check whether `bsize` is reached, before
dereferencing the offset. Even if this always works fine, due to the
string being null-terminated, this certainly looks odd.

Found using GitHub's CodeQL scan.

This bug traces back to at least 97c2ae13bc
(1.7.0+) and this patch should be backported accordingly.
This commit is contained in:
Tim Duesterhus 2021-08-29 00:58:22 +02:00 committed by Willy Tarreau
parent 1f269c12dc
commit 18795d48a9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/tools.c
View file

@ -4522,9 +4522,9 @@ int may_access(const void *ptr)
int dump_text(struct buffer *out, const char *buf, int bsize)
{
unsigned char c;
int ptr = 0;
size_t ptr = 0;
while (buf[ptr] && ptr < bsize) {
while (ptr < bsize && buf[ptr]) {
c = buf[ptr];
if (isprint((unsigned char)c) && isascii((unsigned char)c) && c != '\\' && c != ' ' && c != '=') {
if (out->data > out->size - 1)