mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-08 16:17:09 +02:00
Code Issues Projects Releases Wiki Activity

BUG: buffers: don't return a negative value on buffer_total_space_res()

Browse Source 
In commit 4b517ca93a (MEDIUM: buffers:
add some new primitives and rework existing ones), we forgot to check
if buffer_max_len() < l.

No backport is needed.
This commit is contained in:
Willy Tarreau 2011-11-28 13:40:49 +01:00
parent 4b517ca93a
commit fe4b1f9dc0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/proto/buffers.h
View File

@ -103,11 +103,13 @@ static inline int buffer_total_space(const struct buffer *buf)
} }
/* Return the maximum amount of bytes that can be written into the buffer, /* Return the maximum amount of bytes that can be written into the buffer,
* excluding the reserved space, which is preserved. * excluding the reserved space, which is preserved. 0 may be returned if
* the reserved space was already reached or used.
*/ */
static inline int buffer_total_space_res(const struct buffer *buf) static inline int buffer_total_space_res(const struct buffer *buf)
{ {
return buffer_max_len(buf) - buf->l; int len = buffer_max_len(buf) - buf->l;
return len < 0 ? 0 : len;
} }
/* Returns the number of contiguous bytes between <start> and <start>+<count>, /* Returns the number of contiguous bytes between <start> and <start>+<count>,