mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-15 03:54:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: channel: bo_getline() must wait for \n until buffer is full

Browse Source 
We must not report incomplete data if the buffer is not full, otherwise
we can abort some processing on the stats socket when dealing with massive
amounts of commands.
This commit is contained in:
Willy Tarreau
2013-12-10 18:58:23 +01:00
parent b5e7ef6810
commit 82de2b644e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/channel.c
View File

@@ -230,7 +230,8 @@ int bo_getline(struct channel *chn, char *str, int len)
break;
p = buffer_wrap_add(chn->buf, p + 1);
}
if (ret > 0 && ret < len && ret < chn->buf->o &&
if (ret > 0 && ret < len &&
(ret < chn->buf->o || !channel_full(chn)) &&
*(str-1) != '\n' &&
!(chn->flags & (CF_SHUTW|CF_SHUTW_NOW)))
ret = 0;