Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
03b93736
Commit
03b93736
authored
Aug 09, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MP4: fix variable size leading to Out-of-bound access
Fix cid #1048765
parent
c4595ee6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+4
-4
No files found.
modules/demux/mp4/mp4.c
View file @
03b93736
...
...
@@ -3241,7 +3241,7 @@ static int MP4_frg_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_
/**
* Return the track identified by tid
*/
static
mp4_track_t
*
MP4_frg_GetTrack
(
demux_t
*
p_demux
,
const
uint
16
_t
tid
)
static
mp4_track_t
*
MP4_frg_GetTrack
(
demux_t
*
p_demux
,
const
uint
32
_t
tid
)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
...
...
@@ -3254,7 +3254,7 @@ static mp4_track_t *MP4_frg_GetTrack( demux_t *p_demux, const uint16_t tid )
if
(
ret
->
i_track_ID
==
tid
)
return
ret
;
}
msg_Err
(
p_demux
,
"MP4_frg_GetTrack: track %"
PRIu
16
" not found!"
,
tid
);
msg_Err
(
p_demux
,
"MP4_frg_GetTrack: track %"
PRIu
32
" not found!"
,
tid
);
return
NULL
;
}
...
...
@@ -3552,7 +3552,7 @@ static int MP4_frg_GetChunks( demux_t *p_demux, const unsigned i_tk_id )
if
(
!
p_chunk
->
p_first
)
goto
MP4_frg_GetChunks_Error
;
uint32_t
i_type
=
p_chunk
->
p_first
->
i_type
;
uint
16
_t
tid
=
0
;
uint
32
_t
tid
=
0
;
if
(
i_type
==
ATOM_uuid
||
i_type
==
ATOM_ftyp
)
{
MP4_BoxFree
(
p_demux
->
s
,
p_sys
->
p_root
);
...
...
@@ -3588,7 +3588,7 @@ static int MP4_frg_GetChunks( demux_t *p_demux, const unsigned i_tk_id )
return
MP4_frg_GetChunks
(
p_demux
,
i_tk_id
);
}
if
(
MP4_frg_GetChunk
(
p_demux
,
p_chunk
,
(
unsigned
*
)
&
tid
)
!=
VLC_SUCCESS
)
if
(
MP4_frg_GetChunk
(
p_demux
,
p_chunk
,
&
tid
)
!=
VLC_SUCCESS
)
goto
MP4_frg_GetChunks_Error
;
MP4_BoxFree
(
p_demux
->
s
,
p_chunk
);
...
...
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