From 9b530ad7423c94cd1da25143ca7cba7ea176b05b Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 11 Apr 2024 16:11:17 +0800 Subject: [PATCH] merge subparse optimization --- CVE-2023-37328.patch | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/CVE-2023-37328.patch b/CVE-2023-37328.patch index 56778e6..c3e73f5 100644 --- a/CVE-2023-37328.patch +++ b/CVE-2023-37328.patch @@ -1,14 +1,14 @@ -From 18b887d30a81deadd600017265cb61f5d0e1bea0 Mon Sep 17 00:00:00 2001 -From: technology208 -Date: Thu, 14 Mar 2024 15:54:38 +0800 -Subject: [PATCH] Create Patch +From 87f13216ec814bac49ca3d5e40c9367e670c6fd5 Mon Sep 17 00:00:00 2001 +From: Your Name +Date: Thu, 11 Apr 2024 16:02:41 +0800 +Subject: [PATCH] CreatePatch --- - gst/subparse/gstsubparse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + gst/subparse/gstsubparse.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c -index 4254158..e8d3eca 100644 +index 4254158..e2d446d 100644 --- a/gst/subparse/gstsubparse.c +++ b/gst/subparse/gstsubparse.c @@ -814,7 +814,7 @@ subrip_fix_up_markup (gchar ** p_txt, gconstpointer allowed_tags_ptr) @@ -20,6 +20,23 @@ index 4254158..e8d3eca 100644 if (end_tag) { const gchar *last = NULL; if (num_open_tags > 0) +@@ -822,11 +822,14 @@ subrip_fix_up_markup (gchar ** p_txt, gconstpointer allowed_tags_ptr) + 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); ++ 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 -- Gitee