From 4b8809cca4bbcbf9514314d86227f985362258b0 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Wed, 12 Feb 2025 11:30:02 -0600 Subject: [PATCH] headers: Handle parsing only newlines Closes #404 Closes #407 CVE: CVE-2025-32906 Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/af5b9a4a3945c52b940d5ac181ef51bb12011f1f] Signed-off-by: Changqing Li --- libsoup/soup-headers.c | 4 ++-- tests/header-parsing-test.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c index e5d3c03..87bb3dc 100644 --- a/libsoup/soup-headers.c +++ b/libsoup/soup-headers.c @@ -185,7 +185,7 @@ soup_headers_parse_request (const char *str, /* RFC 2616 4.1 "servers SHOULD ignore any empty line(s) * received where a Request-Line is expected." */ - while ((*str == '\r' || *str == '\n') && len > 0) { + while (len > 0 && (*str == '\r' || *str == '\n')) { str++; len--; } @@ -369,7 +369,7 @@ soup_headers_parse_response (const char *str, * after a response, which we then see prepended to the next * response on that connection. */ - while ((*str == '\r' || *str == '\n') && len > 0) { + while (len > 0 && (*str == '\r' || *str == '\n')) { str++; len--; } diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c index c1d3b33..b811115 100644 --- a/tests/header-parsing-test.c +++ b/tests/header-parsing-test.c @@ -6,6 +6,10 @@ typedef struct { const char *name, *value; } Header; +static char only_newlines[] = { + '\n', '\n', '\n', '\n' +}; + static struct RequestTest { const char *description; const char *bugref; @@ -445,6 +449,13 @@ static struct RequestTest { SOUP_STATUS_BAD_REQUEST, NULL, NULL, -1, { { NULL } } + }, + + { "Only newlines", NULL, + only_newlines, sizeof (only_newlines), + SOUP_STATUS_BAD_REQUEST, + NULL, NULL, -1, + { { NULL } } } }; static const int num_reqtests = G_N_ELEMENTS (reqtests); -- 2.34.1