40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
From 8158b4084dcba2a233dfcb7359c53ab2840148f7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Milan Crha <mcrha@redhat.com>
|
||
|
|
Date: Tue, 15 Apr 2025 12:17:39 +0200
|
||
|
|
Subject: [PATCH 1/2] soup-message-headers: Correct merge of ranges
|
||
|
|
|
||
|
|
It had been skipping every second range, which generated an array
|
||
|
|
of a lot of insane ranges, causing large memory usage by the server.
|
||
|
|
|
||
|
|
Closes #428
|
||
|
|
|
||
|
|
Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452>
|
||
|
|
|
||
|
|
CVE: CVE-2025-32907
|
||
|
|
Upstream-Status: Backport
|
||
|
|
[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452/diffs?commit_id=9bb92f7a685e31e10e9e8221d0342280432ce836]
|
||
|
|
|
||
|
|
Test part not applied since test codes use some functions not in this
|
||
|
|
version
|
||
|
|
|
||
|
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||
|
|
---
|
||
|
|
libsoup/soup-message-headers.c | 1 +
|
||
|
|
1 files changed, 1 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
|
||
|
|
index 78b2455..00b9763 100644
|
||
|
|
--- a/libsoup/soup-message-headers.c
|
||
|
|
+++ b/libsoup/soup-message-headers.c
|
||
|
|
@@ -1024,6 +1024,7 @@ soup_message_headers_get_ranges_internal (SoupMessageHeaders *hdrs,
|
||
|
|
if (cur->start <= prev->end) {
|
||
|
|
prev->end = MAX (prev->end, cur->end);
|
||
|
|
g_array_remove_index (array, i);
|
||
|
|
+ i--;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|