mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: buffer: Fix the wrapping case in bo_putblk

Browse Source 
When the block of data need to be split to support the wrapping, the start of
the second block of data was wrong. We must be sure to skip data copied during
the first memcpy.

This patch must be backported to 1.8, 1.7, 1.6 and 1.5.
This commit is contained in:
Christopher Faulet 2018-02-26 10:47:03 +01:00 committed by Willy Tarreau
parent 35a62705df
commit b2b279464c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/buffer.h
View File

@ -468,7 +468,7 @@ static inline int bo_putblk(struct buffer *b, const char *blk, int len)
memcpy(b->p, blk, half);
b->p = b_ptr(b, half);
if (len > half) {
memcpy(b->p, blk, len - half);
memcpy(b->p, blk + half, len - half);
b->p = b_ptr(b, half);
}
b->o += len;