41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
|
From 93f50e27e5a9b893d6131c75a6e476272795f8be Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||
|
|
Date: Fri, 4 Oct 2024 13:27:27 +0300
|
||
|
|
Subject: [PATCH 09/28] wavparse: Fix clipping of size to the file size
|
||
|
|
|
||
|
|
The size does not include the 8 bytes tag and length, so an additional 8 bytes
|
||
|
|
must be removed here. 8 bytes are always available at this point because
|
||
|
|
otherwise the parsing of the tag and length right above would've failed.
|
||
|
|
|
||
|
|
Thanks to Antonio Morales for finding and reporting the issue.
|
||
|
|
|
||
|
|
Fixes GHSL-2024-260
|
||
|
|
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3888
|
||
|
|
|
||
|
|
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8042>
|
||
|
|
---
|
||
|
|
subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c b/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
|
||
|
|
index e42bb24b9b..2499416a76 100644
|
||
|
|
--- a/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
|
||
|
|
+++ b/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
|
||
|
|
@@ -1337,10 +1337,11 @@ gst_wavparse_stream_headers (GstWavParse * wav)
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Clip to upstream size if known */
|
||
|
|
- if (upstream_size > 0 && size + wav->offset > upstream_size) {
|
||
|
|
+ if (upstream_size > 0 && size + 8 + wav->offset > upstream_size) {
|
||
|
|
GST_WARNING_OBJECT (wav, "Clipping chunk size to file size");
|
||
|
|
g_assert (upstream_size >= wav->offset);
|
||
|
|
- size = upstream_size - wav->offset;
|
||
|
|
+ g_assert (upstream_size - wav->offset >= 8);
|
||
|
|
+ size = upstream_size - wav->offset - 8;
|
||
|
|
}
|
||
|
|
|
||
|
|
/* wav is a st00pid format, we don't know for sure where data starts.
|
||
|
|
--
|
||
|
|
2.47.0
|
||
|
|
|