summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0008-ssaparse-Search-for-closing-brace-after-opening-brac.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0008-ssaparse-Search-for-closing-brace-after-opening-brac.patch')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0008-ssaparse-Search-for-closing-brace-after-opening-brac.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0008-ssaparse-Search-for-closing-brace-after-opening-brac.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0008-ssaparse-Search-for-closing-brace-after-opening-brac.patch
new file mode 100644
index 0000000000..a20d2b4cca
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0008-ssaparse-Search-for-closing-brace-after-opening-brac.patch
@@ -0,0 +1,38 @@
1From 15bb318416e1bf6b6b557006a37d1da86c3a76a8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
3Date: Mon, 30 Sep 2024 21:40:44 +0300
4Subject: [PATCH 1/2] ssaparse: Search for closing brace after opening brace
5
6Otherwise removing anything between the braces leads to out of bound writes if
7there is a closing brace before the first opening brace.
8
9Thanks to Antonio Morales for finding and reporting the issue.
10
11Fixes GHSL-2024-228
12Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3870
13
14Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8036>
15
16CVE: CVE-2024-47541
17Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/15bb318416e1bf6b6b557006a37d1da86c3a76a8]
18Signed-off-by: Peter Marko <peter.marko@siemens.com>
19---
20 gst/subparse/gstssaparse.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c
24index 42fbb42b99..37b892e928 100644
25--- a/gst/subparse/gstssaparse.c
26+++ b/gst/subparse/gstssaparse.c
27@@ -238,7 +238,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt)
28 gboolean removed_any = FALSE;
29
30 while ((t = strchr (txt, '{'))) {
31- end = strchr (txt, '}');
32+ end = strchr (t, '}');
33 if (end == NULL) {
34 GST_WARNING_OBJECT (parse, "Missing { for style override code");
35 return removed_any;
36--
372.30.2
38