From 7b4ef0e004ece3a308ccfaa714c284f4c96ade34 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Fri, 27 Dec 2024 17:53:50 -0600 Subject: [PATCH] soup_message_headers_get_content_disposition: Fix NULL deref Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/7b4ef0e004ece3a308ccfaa714c284f4c96ade34] CVE: CVE-2025-32911 CVE-2025-32913 #Dependency Patch Signed-off-by: Vijay Anusuri --- libsoup/soup-message-headers.c | 13 +++++++++---- tests/header-parsing-test.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c index 56cc1e9d..04f4c302 100644 --- a/libsoup/soup-message-headers.c +++ b/libsoup/soup-message-headers.c @@ -1660,10 +1660,15 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders *hdrs, */ if (params && g_hash_table_lookup_extended (*params, "filename", &orig_key, &orig_value)) { - char *filename = strrchr (orig_value, '/'); - - if (filename) - g_hash_table_insert (*params, g_strdup (orig_key), filename + 1); + if (orig_value) { + char *filename = strrchr (orig_value, '/'); + + if (filename) + g_hash_table_insert (*params, g_strdup (orig_key), filename + 1); + } else { + /* filename with no value isn't valid. */ + g_hash_table_remove (*params, "filename"); + } } return TRUE; } diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c index 5e423d2b..d0b360c8 100644 --- a/tests/header-parsing-test.c +++ b/tests/header-parsing-test.c @@ -1039,6 +1039,7 @@ do_param_list_tests (void) #define RFC5987_TEST_HEADER_FALLBACK "attachment; filename*=Unknown''t%FF%FF%FFst.txt; filename=\"test.txt\"" #define RFC5987_TEST_HEADER_NO_TYPE "filename=\"test.txt\"" #define RFC5987_TEST_HEADER_NO_TYPE_2 "filename=\"test.txt\"; foo=bar" +#define RFC5987_TEST_HEADER_EMPTY_FILENAME ";filename" static void do_content_disposition_tests (void) @@ -1139,6 +1140,19 @@ do_content_disposition_tests (void) g_assert_cmpstr (parameter2, ==, "bar"); g_hash_table_destroy (params); + /* Empty filename */ + soup_message_headers_clear (hdrs); + soup_message_headers_append (hdrs, "Content-Disposition", + RFC5987_TEST_HEADER_EMPTY_FILENAME); + if (!soup_message_headers_get_content_disposition (hdrs, + &disposition, + ¶ms)) { + soup_test_assert (FALSE, "empty filename decoding FAILED"); + return; + } + g_assert_false (g_hash_table_contains (params, "filename")); + g_hash_table_destroy (params); + soup_message_headers_unref (hdrs); /* Ensure that soup-multipart always quotes filename */ -- GitLab