Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
06507459
Commit
06507459
authored
Apr 10, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "asx: fix use-after-free"
This reverts commit
2983a6e3
. Ref #14062
parent
fb951d94
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
modules/demux/playlist/asx.c
modules/demux/playlist/asx.c
+14
-14
No files found.
modules/demux/playlist/asx.c
View file @
06507459
...
...
@@ -210,11 +210,11 @@ static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader,
/* Metadata Node */
if
(
!
strncasecmp
(
psz_node
,
"TITLE"
,
5
)
)
ReadElement
(
p_xml_reader
,
&
psz_title
);
else
if
(
!
strncasecmp
(
psz_node
,
"AUTHOR"
,
6
)
)
if
(
!
strncasecmp
(
psz_node
,
"AUTHOR"
,
6
)
)
ReadElement
(
p_xml_reader
,
&
psz_artist
);
else
if
(
!
strncasecmp
(
psz_node
,
"COPYRIGHT"
,
9
)
)
if
(
!
strncasecmp
(
psz_node
,
"COPYRIGHT"
,
9
)
)
ReadElement
(
p_xml_reader
,
&
psz_copyright
);
else
if
(
!
strncasecmp
(
psz_node
,
"MOREINFO"
,
8
)
)
if
(
!
strncasecmp
(
psz_node
,
"MOREINFO"
,
8
)
)
{
do
{
...
...
@@ -228,13 +228,13 @@ static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader,
psz_moreinfo
=
strdup
(
psz_node
);
resolve_xml_special_chars
(
psz_moreinfo
);
}
else
if
(
!
strncasecmp
(
psz_node
,
"ABSTRACT"
,
8
)
)
if
(
!
strncasecmp
(
psz_node
,
"ABSTRACT"
,
8
)
)
ReadElement
(
p_xml_reader
,
&
psz_description
);
else
if
(
!
strncasecmp
(
psz_node
,
"DURATION"
,
8
)
)
if
(
!
strncasecmp
(
psz_node
,
"DURATION"
,
8
)
)
i_duration
=
ParseTime
(
p_xml_reader
);
else
if
(
!
strncasecmp
(
psz_node
,
"STARTTIME"
,
9
)
)
if
(
!
strncasecmp
(
psz_node
,
"STARTTIME"
,
9
)
)
i_start
=
ParseTime
(
p_xml_reader
);
else
/* Reference Node */
/* All ref node will be converted into an entry */
if
(
!
strncasecmp
(
psz_node
,
"REF"
,
3
)
)
...
...
@@ -361,17 +361,17 @@ static int Demux( demux_t *p_demux )
ReadElement
(
p_xml_reader
,
&
psz_title_asx
);
input_item_SetTitle
(
p_current_input
,
psz_title_asx
);
}
else
if
(
!
strncasecmp
(
psz_node
,
"AUTHOR"
,
6
)
)
if
(
!
strncasecmp
(
psz_node
,
"AUTHOR"
,
6
)
)
{
ReadElement
(
p_xml_reader
,
&
psz_txt
);
input_item_SetArtist
(
p_current_input
,
psz_txt
);
}
else
if
(
!
strncasecmp
(
psz_node
,
"COPYRIGHT"
,
9
)
)
if
(
!
strncasecmp
(
psz_node
,
"COPYRIGHT"
,
9
)
)
{
ReadElement
(
p_xml_reader
,
&
psz_txt
);
input_item_SetCopyright
(
p_current_input
,
psz_txt
);
}
else
if
(
!
strncasecmp
(
psz_node
,
"MOREINFO"
,
8
)
)
if
(
!
strncasecmp
(
psz_node
,
"MOREINFO"
,
8
)
)
{
const
char
*
psz_tmp
;
do
...
...
@@ -388,16 +388,16 @@ static int Demux( demux_t *p_demux )
resolve_xml_special_chars
(
psz_txt
);
input_item_SetURL
(
p_current_input
,
psz_txt
);
}
else
if
(
!
strncasecmp
(
psz_node
,
"ABSTRACT"
,
8
)
)
if
(
!
strncasecmp
(
psz_node
,
"ABSTRACT"
,
8
)
)
{
ReadElement
(
p_xml_reader
,
&
psz_txt
);
input_item_SetDescription
(
p_current_input
,
psz_txt
);
}
else
/* Base Node handler */
if
(
!
strncasecmp
(
psz_node
,
"BASE"
,
4
)
)
ReadElement
(
p_xml_reader
,
&
psz_base
);
else
/* Entry Ref Handler */
if
(
!
strncasecmp
(
psz_node
,
"ENTRYREF"
,
7
)
)
{
...
...
@@ -418,7 +418,7 @@ static int Demux( demux_t *p_demux )
vlc_gc_decref
(
p_input
);
}
else
/* Entry Handler */
if
(
!
strncasecmp
(
psz_node
,
"ENTRY"
,
5
)
)
{
...
...
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