mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2026-01-19 17:11:22 +01:00
[CLEANUP] buffers: wrong size calculation for displaced data
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 019fd5bc932e2527c4a7bf196903aa1055537c1f)
This commit is contained in:
parent
80b085003a
commit
c04b83edaf
@ -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) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user