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

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 skup data copied during
the first memcpy.

This patch must be backported to 1.8.

diff --git a/include/common/buffer.h b/include/common/buffer.h
index 4adfdc6471c6d4ad59a69d7a3098d4359da7aa8e..7ac98bf0d527b539e31a6394cd69a500e906a6d8 100644 (file)
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -577,7 +577,7 @@ static inline int bi_putblk(struct buffer *b, const char *blk, int len)
 
        memcpy(bi_end(b), blk, half);
        if (len > half)
-               memcpy(b_ptr(b, b->i + half), blk, len - half);
+               memcpy(b_ptr(b, b->i + half), blk + half, len - half);
        b->i += len;
        return len;
 }