42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
|
From c6f4528710213d4887cbd2bf60eddfe97f1e7529 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||
|
|
Date: Thu, 26 Sep 2024 22:16:06 +0300
|
||
|
|
Subject: [PATCH 01/28] qtdemux: Avoid integer overflow when parsing Theora
|
||
|
|
extension
|
||
|
|
|
||
|
|
Thanks to Antonio Morales for finding and reporting the issue.
|
||
|
|
|
||
|
|
Fixes GHSL-2024-166
|
||
|
|
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3851
|
||
|
|
|
||
|
|
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8094>
|
||
|
|
---
|
||
|
|
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
|
||
|
|
index a53d61e649..fcc818c7d7 100644
|
||
|
|
--- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
|
||
|
|
+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
|
||
|
|
@@ -8258,7 +8258,7 @@ qtdemux_parse_theora_extension (GstQTDemux * qtdemux, QtDemuxStream * stream,
|
||
|
|
end -= 8;
|
||
|
|
|
||
|
|
while (buf < end) {
|
||
|
|
- gint size;
|
||
|
|
+ guint32 size;
|
||
|
|
guint32 type;
|
||
|
|
|
||
|
|
size = QT_UINT32 (buf);
|
||
|
|
@@ -8266,7 +8266,7 @@ qtdemux_parse_theora_extension (GstQTDemux * qtdemux, QtDemuxStream * stream,
|
||
|
|
|
||
|
|
GST_LOG_OBJECT (qtdemux, "%p %p", buf, end);
|
||
|
|
|
||
|
|
- if (buf + size > end || size <= 0)
|
||
|
|
+ if (end - buf < size || size < 8)
|
||
|
|
break;
|
||
|
|
|
||
|
|
buf += 8;
|
||
|
|
--
|
||
|
|
2.47.0
|
||
|
|
|