From 7eaec1f066e9193fcaa10d01031f6d37c32a7792 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 2 Mar 2026 12:10:11 -0400 Subject: [PATCH] MT#55283 fix buffer merge logic Oof. Change-Id: Ibc3ca28bc6c04e63b27466e62b197f6a601051f9 (cherry picked from commit f307c32c8081719a13b16fba263526400118a70c) (cherry picked from commit c9605165cf4ba336541df8ca06039c4dfc9a7e18) --- lib/bencode.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bencode.c b/lib/bencode.c index 3ef6cee71..3cb403e1f 100644 --- a/lib/bencode.c +++ b/lib/bencode.c @@ -147,8 +147,10 @@ void bencode_buffer_free(bencode_buffer_t *buf) { } void bencode_buffer_merge(bencode_buffer_t *to, bencode_buffer_t *from) { - from->pieces->next = to->pieces; - to->pieces = from->pieces; + struct __bencode_buffer_piece *last = to->pieces; + while (last->next) + last = last->next; + last->next = from->pieces; from->pieces = NULL; }