mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

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 97c2ae13bc0d7961a348102d6719fbcaf34d46d5
(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) int dump_text(struct buffer *out, const char *buf, int bsize)
{ {
unsigned char c; unsigned char c;
int ptr = 0; size_t ptr = 0;
while (buf[ptr] && ptr < bsize) { while (ptr < bsize && buf[ptr]) {
c = buf[ptr]; c = buf[ptr];
if (isprint((unsigned char)c) && isascii((unsigned char)c) && c != '\\' && c != ' ' && c != '=') { if (isprint((unsigned char)c) && isascii((unsigned char)c) && c != '\\' && c != ' ' && c != '=') {
if (out->data > out->size - 1) if (out->data > out->size - 1)