mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 21:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

subparse: Interprete typefind strings passed to GRegex as raw bytes instead of valid UTF8

Browse source
This commit is contained in:
Sebastian Dröge 2011-05-23 15:51:14 +02:00 committed by Tim-Philipp Müller
parent 9497409483
commit 1786ebb084
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/subparse/gstsubparse.c
View file

@ -1238,7 +1238,8 @@ gst_sub_parse_data_format_autodetect_regex_once (GstSubParseRegex regtype)
switch (regtype) { switch (regtype) {
case GST_SUB_PARSE_REGEX_MDVDSUB: case GST_SUB_PARSE_REGEX_MDVDSUB:
result = result =
(gpointer) g_regex_new ("^\\{[0-9]+\\}\\{[0-9]+\\}", 0, 0, &gerr); (gpointer) g_regex_new ("^\\{[0-9]+\\}\\{[0-9]+\\}", G_REGEX_RAW, 0,
&gerr);
if (result == NULL) { if (result == NULL) {
g_warning ("Compilation of mdvd regex failed: %s", gerr->message); g_warning ("Compilation of mdvd regex failed: %s", gerr->message);
g_error_free (gerr); g_error_free (gerr);
@ -1248,7 +1249,7 @@ gst_sub_parse_data_format_autodetect_regex_once (GstSubParseRegex regtype)
result = (gpointer) g_regex_new ("^([ 0-9]){0,3}[0-9]\\s*(\x0d)?\x0a" result = (gpointer) g_regex_new ("^([ 0-9]){0,3}[0-9]\\s*(\x0d)?\x0a"
"[ 0-9][0-9]:[ 0-9][0-9]:[ 0-9][0-9][,.][ 0-9]{0,2}[0-9]" "[ 0-9][0-9]:[ 0-9][0-9]:[ 0-9][0-9][,.][ 0-9]{0,2}[0-9]"
" +--> +([ 0-9])?[0-9]:[ 0-9][0-9]:[ 0-9][0-9][,.][ 0-9]{0,2}[0-9]", " +--> +([ 0-9])?[0-9]:[ 0-9][0-9]:[ 0-9][0-9][,.][ 0-9]{0,2}[0-9]",
0, 0, &gerr); G_REGEX_RAW, 0, &gerr);
if (result == NULL) { if (result == NULL) {
g_warning ("Compilation of subrip regex failed: %s", gerr->message); g_warning ("Compilation of subrip regex failed: %s", gerr->message);
g_error_free (gerr); g_error_free (gerr);
@ -1256,7 +1257,7 @@ gst_sub_parse_data_format_autodetect_regex_once (GstSubParseRegex regtype)
break; break;
case GST_SUB_PARSE_REGEX_DKS: case GST_SUB_PARSE_REGEX_DKS:
result = (gpointer) g_regex_new ("^\\[[0-9]+:[0-9]+:[0-9]+\\].*", result = (gpointer) g_regex_new ("^\\[[0-9]+:[0-9]+:[0-9]+\\].*",
0, 0, &gerr); G_REGEX_RAW, 0, &gerr);
if (result == NULL) { if (result == NULL) {
g_warning ("Compilation of dks regex failed: %s", gerr->message); g_warning ("Compilation of dks regex failed: %s", gerr->message);
g_error_free (gerr); g_error_free (gerr);