MT#55283 fix buffer merge logic

rfuchs · rfuchs · commit c9605165cf4b · 2026-03-02T17:27:18.000+01:00
Oof. Change-Id: Ibc3ca28bc6c04e63b27466e62b197f6a601051f9 (cherry picked from commit f307c32)
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,10 @@ void bencode_buffer_free(bencode_buffer_t *buf) {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`void bencode_buffer_merge(bencode_buffer_t to, bencode_buffer_t from) {`
`150`		`- from->pieces->next = to->pieces;`
`151`		`- to->pieces = from->pieces;`
	`150`	`+ struct __bencode_buffer_piece *last = to->pieces;`
	`151`	`+ while (last->next)`
	`152`	`+ last = last->next;`
	`153`	`+ last->next = from->pieces;`
`152`	`154`	`from->pieces = NULL;`
`153`	`155`	`}`
`154`	`156`