packages/gstreamer1-plugins-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!50 [sync] PR-45: 优化end_tag处理

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot
This commit is contained in:
openeuler-ci-bot 2024-05-23 09:20:35 +00:00 committed by Gitee
commit d13ad92b84
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
CVE-2023-37328.patch
View File

@ -1,17 +1,17 @@
From 18b887d30a81deadd600017265cb61f5d0e1bea0 Mon Sep 17 00:00:00 2001 From 803fec1d19a401af00153e0b5791bf9a14e11ca4 Mon Sep 17 00:00:00 2001
From: technology208 <technology@208suo.com> From: technology208 <technology@208suo.com>
Date: Thu, 14 Mar 2024 15:54:38 +0800 Date: Thu, 11 Apr 2024 15:33:46 +0800
Subject: [PATCH] Create Patch Subject: [PATCH] CreatePatch
--- ---
gst/subparse/gstsubparse.c | 2 +- gst/subparse/gstsubparse.c | 11 +++++++----
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
index 4254158..e8d3eca 100644 index 382e430..423112a 100644
--- a/gst/subparse/gstsubparse.c --- a/gst/subparse/gstsubparse.c
+++ b/gst/subparse/gstsubparse.c +++ b/gst/subparse/gstsubparse.c
@@ -814,7 +814,7 @@ subrip_fix_up_markup (gchar ** p_txt, gconstpointer allowed_tags_ptr) @@ -815,19 +815,22 @@ subrip_fix_up_markup (gchar ** p_txt, gconstpointer allowed_tags_ptr)
} }
if (*next_tag == '<' && *(next_tag + 1) == '/') { if (*next_tag == '<' && *(next_tag + 1) == '/') {
@ -20,6 +20,24 @@ index 4254158..e8d3eca 100644
if (end_tag) { if (end_tag) {
const gchar *last = NULL; const gchar *last = NULL;
if (num_open_tags > 0) if (num_open_tags > 0)
last = g_ptr_array_index (open_tags, num_open_tags - 1);
if (num_open_tags == 0
|| g_ascii_strncasecmp (end_tag - 1, last, strlen (last))) {
- GST_LOG ("broken input, closing tag '%s' is not open", end_tag - 1);
- memmove (next_tag, end_tag + 1, strlen (end_tag) + 1);
- next_tag -= strlen (end_tag);
+ GST_LOG ("broken input, closing tag '%s' is not open", next_tag);
+ memmove (next_tag, end_tag + 1, strlen (end_tag));
+ cur = next_tag;
+ continue;
} else {
--num_open_tags;
g_ptr_array_remove_index (open_tags, num_open_tags);
+ cur = end_tag + 1;
+ continue;
}
}
}
-- --
2.33.0 2.43.0

5
gstreamer1-plugins-base.spec
View File

@ -3,7 +3,7 @@
Name: gstreamer1-plugins-base Name: gstreamer1-plugins-base
Version: 1.18.4 Version: 1.18.4
Release: 6 Release: 7
Summary: GStreamer streaming media framework base plugins Summary: GStreamer streaming media framework base plugins
License: LGPLv2+ License: LGPLv2+
URL: http://gstreamer.freedesktop.org/ URL: http://gstreamer.freedesktop.org/
@ -270,6 +270,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
%{_mandir}/man1/gst-device-monitor-*.gz %{_mandir}/man1/gst-device-monitor-*.gz
%changelog %changelog
* Mon May 20 2024 technology208 <technology@208suo.com> - 1.18.4-7
- optimize subparse end_tag process
* Fri Mar 15 2024 technology208 <technology@208suo.com> - 1.18.4-6 * Fri Mar 15 2024 technology208 <technology@208suo.com> - 1.18.4-6
- fix CVE-2023-37328 - fix CVE-2023-37328