upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-06-15 20:39:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[CLEANUP] 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.
(cherry picked from commit 019fd5bc93)
This commit is contained in:
Willy Tarreau 2009-12-28 18:37:54 +01:00
parent 80b085003a
commit c04b83edaf
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

@ -115,7 +115,7 @@ int buffer_replace(struct buffer *b, char *pos, char *end, const char *str)
return 0; /* no space left */
/* 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 */
memcpy(pos, str,len);
@ -155,7 +155,7 @@ int buffer_replace2(struct buffer *b, char *pos, char *end, const char *str, int
}
/* 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 */
if (len)
@ -196,7 +196,7 @@ int buffer_insert_line2(struct buffer *b, char *pos, const char *str, int len)
return 0; /* no space left */
/* 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 */
if (len && str) {