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

[BUG] fix buffer_skip() and buffer_si_getline() to correctly handle wrap-arounds

Browse source 
Those two functions did not correctly deal with full buffers and/or
buffers that wrapped around. Buffer_skip() was even able to incorrectly
set buf->w further than the end of buffer if its len argument was wrong,
and buffer_si_getline() was able to incorrectly return a length larger
than the effective buffer data available.
This commit is contained in:
Willy Tarreau 2009-09-23 22:56:07 +02:00
parent fb0e9209a9
commit 2e1dd3d213
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/proto/buffers.h
View file

@ -331,13 +331,13 @@ static inline int buffer_contig_data(struct buffer *buf)
* Advance the buffer's read pointer by <len> bytes. This is useful when data
* have been read directly from the buffer. It is illegal to call this function
* with <len> causing a wrapping at the end of the buffer. It's the caller's
* responsibility to ensure that <len> is never larger than buffer_contig_data.
* responsibility to ensure that <len> is never larger than buf->send_max.
*/
static inline void buffer_skip(struct buffer *buf, int len)
{
buf->w += len;
if (buf->w == buf->data + buf->size)
buf->w = buf->data; /* wrap around the buffer */
if (buf->w >= buf->data + buf->size)
buf->w -= buf->size; /* wrap around the buffer */
buf->l -= len;
if (!buf->l)

7
src/buffers.c
View file

@ -151,7 +151,7 @@ int buffer_si_peekline(struct buffer *buf, char *str, int len)
if (max > buf->send_max) {
max = buf->send_max;
str[max] = 0;
str[max-1] = 0;
}
while (max) {
*str++ = *p;
@ -164,8 +164,9 @@ int buffer_si_peekline(struct buffer *buf, char *str, int len)
if (p == buf->data + buf->size)
p = buf->data;
}
if (*p != '\n' && ret < len && ret < buf->max_len &&
!(buf->flags & (BF_SHUTW|BF_SHUTW_NOW)))
if (ret > 0 && ret < len && ret < buf->send_max &&
*(str-1) != '\n' &&
!(buf->flags & (BF_SHUTW|BF_SHUTW_NOW)))
ret = 0;
out:
if (max)