Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
ba00f4c0
Commit
ba00f4c0
authored
Jan 21, 2011
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XML: throw an error if HTML subtitles have no root node
This shouldn't happen unless the codec is buggy
parent
39a6fe50
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
4 deletions
+24
-4
modules/misc/freetype.c
modules/misc/freetype.c
+11
-2
modules/misc/quartztext.c
modules/misc/quartztext.c
+13
-2
No files found.
modules/misc/freetype.c
View file @
ba00f4c0
...
@@ -2181,11 +2181,20 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
...
@@ -2181,11 +2181,20 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
/* Only text and karaoke tags are supported */
/* Only text and karaoke tags are supported */
msg_Dbg
(
p_filter
,
"Unsupported top-level tag <%s> ignored."
,
msg_Dbg
(
p_filter
,
"Unsupported top-level tag <%s> ignored."
,
node
);
node
);
p_filter
->
p_sys
->
p_xml
=
xml_ReaderReset
(
p_xml_reader
,
NULL
);
p_xml_reader
=
NULL
;
rv
=
VLC_EGENERIC
;
rv
=
VLC_EGENERIC
;
}
}
}
}
else
{
msg_Err
(
p_filter
,
"Malformed HTML subtitle"
);
rv
=
VLC_EGENERIC
;
}
if
(
rv
!=
VLC_SUCCESS
)
{
p_filter
->
p_sys
->
p_xml
=
xml_ReaderReset
(
p_xml_reader
,
NULL
);
p_xml_reader
=
NULL
;
}
}
}
if
(
p_xml_reader
)
if
(
p_xml_reader
)
...
...
modules/misc/quartztext.c
View file @
ba00f4c0
...
@@ -833,10 +833,21 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
...
@@ -833,10 +833,21 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
else
else
{
{
/* Only text and karaoke tags are supported */
/* Only text and karaoke tags are supported */
xml_ReaderDelete
(
p_xml_reader
);
msg_Dbg
(
p_filter
,
"Unsupported top-level tag "
p_xml_reader
=
NULL
;
"<%s> ignored."
,
name
);
rv
=
VLC_EGENERIC
;
}
}
else
{
msg_Err
(
p_filter
,
"Malformed HTML subtitle"
);
rv
=
VLC_EGENERIC
;
rv
=
VLC_EGENERIC
;
}
}
if
(
rv
!=
VLC_SUCCESS
)
{
xml_ReaderDelete
(
p_xml_reader
);
p_xml_reader
=
NULL
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment