From e6e088e62c10ab91fa2f2ad5c122332aa7cde97c Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 12 May 2025 16:55:37 +0800 Subject: [PATCH] content-sniffer: Handle sniffing resource shorter than 4 bytes CVE: CVE-2025-32909 Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/ba4c3a6f988beff59e45801ab36067293d24ce92] Signed-off-by: Changqing Li --- libsoup/soup-content-sniffer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c index eac9e7b..73d2245 100644 --- a/libsoup/soup-content-sniffer.c +++ b/libsoup/soup-content-sniffer.c @@ -227,9 +227,14 @@ sniff_mp4 (SoupContentSniffer *sniffer, SoupBuffer *buffer) { const char *resource = (const char *)buffer->data; guint resource_length = MIN (512, buffer->length); - guint32 box_size = *((guint32*)resource); + guint32 box_size; guint i; + if (resource_length < sizeof (guint32)) + return FALSE; + + box_size = *((guint32*)resource); + #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ box_size = ((box_size >> 24) | ((box_size << 8) & 0x00FF0000) | -- 2.34.1