FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

subparse: Check for valid UTF-8 before cleaning up lines and check for regex replace errors

Browse Source 
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4418
Fixes CVE-2025-47807

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9132>
This commit is contained in:
Sebastian Dröge 2025-05-08 09:14:15 +03:00 committed by GStreamer Marge Bot
parent 6b19f11751
commit 9e2238adc1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subprojects/gst-plugins-base/gst/subparse/gstsubparse.c
View File

@ -668,6 +668,12 @@ subrip_unescape_formatting (gchar * txt, gconstpointer allowed_tags_ptr,
res = g_regex_replace (tag_regex, txt, strlen (txt), 0,
replace_pattern, 0, NULL);
/* Replacing can fail. Return an empty string in that case. */
if (!res) {
strcpy (txt, "");
return;
}
/* res will always be shorter than the input or identical, so this
* copy is OK */
strcpy (txt, res);
@ -1039,6 +1045,10 @@ parse_subrip (ParserState * state, const gchar * line)
g_string_append_c (state->buf, '\n');
g_string_append (state->buf, line);
if (strlen (line) == 0) {
if (!g_utf8_validate (state->buf->str, state->buf->len, NULL)) {
g_string_truncate (state->buf, 0);
return NULL;
}
ret = g_markup_escape_text (state->buf->str, state->buf->len);
g_string_truncate (state->buf, 0);
state->state = 0;