RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-02 11:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] buffers: wrong size calculation for displaced data

Browse Source 
This error was triggered by requests not starting at the beginning
of the buffer. It cannot happen with earlier versions though it might
be a good idea to fix it anyway.
This commit is contained in:
Willy Tarreau 2009-12-28 18:37:54 +01:00
parent 83e3af0c86
commit 019fd5bc93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/buffers.c
View File

@ -197,7 +197,7 @@ int buffer_replace(struct buffer *b, char *pos, char *end, const char *str)
return 0; /* no space left */ return 0; /* no space left */
/* first, protect the end of the buffer */ /* first, protect the end of the buffer */
memmove(end + delta, end, b->data + b->l - end); memmove(end + delta, end, b->r - end);
/* now, copy str over pos */ /* now, copy str over pos */
memcpy(pos, str,len); memcpy(pos, str,len);
@ -237,7 +237,7 @@ int buffer_replace2(struct buffer *b, char *pos, char *end, const char *str, int
} }
/* first, protect the end of the buffer */ /* first, protect the end of the buffer */
memmove(end + delta, end, b->data + b->l - end); memmove(end + delta, end, b->r - end);
/* now, copy str over pos */ /* now, copy str over pos */
if (len) if (len)
@ -278,7 +278,7 @@ int buffer_insert_line2(struct buffer *b, char *pos, const char *str, int len)
return 0; /* no space left */ return 0; /* no space left */
/* first, protect the end of the buffer */ /* first, protect the end of the buffer */
memmove(pos + delta, pos, b->data + b->l - pos); memmove(pos + delta, pos, b->r - pos);
/* now, copy str over pos */ /* now, copy str over pos */
if (len && str) { if (len && str) {