37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From ba4c3a6f988beff59e45801ab36067293d24ce92 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Griffis <pgriffis@igalia.com>
|
|
Date: Wed, 8 Jan 2025 16:30:17 -0600
|
|
Subject: [PATCH] content-sniffer: Handle sniffing resource shorter than 4
|
|
bytes
|
|
|
|
Conflict: context adaptation and modify file path adaptation: libsoup/content-sniffer/soup-content-sniffer.c->libsoup/soup-content-sniffer.c
|
|
Reference: https://gitlab.gnome.org/GNOME/libsoup/-/commit/ba4c3a6f988beff59e45801ab36067293d24ce92
|
|
|
|
---
|
|
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 c52d2d0..ee32971 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.48.1
|
|
|