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
ef466bbd
Commit
ef466bbd
authored
Dec 18, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mp4: fix stsz parsing
Do not malloc 900Mb, for example... Close #5689
parent
ffdde605
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
10 deletions
+9
-10
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+9
-10
No files found.
modules/demux/mp4/libmp4.c
View file @
ef466bbd
...
@@ -1705,28 +1705,27 @@ static int MP4_ReadBox_stsd( stream_t *p_stream, MP4_Box_t *p_box )
...
@@ -1705,28 +1705,27 @@ static int MP4_ReadBox_stsd( stream_t *p_stream, MP4_Box_t *p_box )
static
int
MP4_ReadBox_stsz
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
static
int
MP4_ReadBox_stsz
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
{
{
unsigned
int
i
;
MP4_READBOX_ENTER
(
MP4_Box_data_stsz_t
);
MP4_READBOX_ENTER
(
MP4_Box_data_stsz_t
);
MP4_GETVERSIONFLAGS
(
p_box
->
data
.
p_stsz
);
MP4_GETVERSIONFLAGS
(
p_box
->
data
.
p_stsz
);
MP4_GET4BYTES
(
p_box
->
data
.
p_stsz
->
i_sample_size
);
MP4_GET4BYTES
(
p_box
->
data
.
p_stsz
->
i_sample_size
);
MP4_GET4BYTES
(
p_box
->
data
.
p_stsz
->
i_sample_count
);
MP4_GET4BYTES
(
p_box
->
data
.
p_stsz
->
i_sample_count
);
p_box
->
data
.
p_stsz
->
i_entry_size
=
if
(
p_box
->
data
.
p_stsz
->
i_sample_size
==
0
)
calloc
(
p_box
->
data
.
p_stsz
->
i_sample_count
,
sizeof
(
uint32_t
)
);
if
(
p_box
->
data
.
p_stsz
->
i_entry_size
==
NULL
)
MP4_READBOX_EXIT
(
0
);
if
(
!
p_box
->
data
.
p_stsz
->
i_sample_size
)
{
{
for
(
i
=
0
;
(
i
<
p_box
->
data
.
p_stsz
->
i_sample_count
)
&&
(
i_read
>=
4
);
i
++
)
p_box
->
data
.
p_stsz
->
i_entry_size
=
calloc
(
p_box
->
data
.
p_stsz
->
i_sample_count
,
sizeof
(
uint32_t
)
);
if
(
unlikely
(
!
p_box
->
data
.
p_stsz
->
i_entry_size
)
)
MP4_READBOX_EXIT
(
0
);
for
(
unsigned
int
i
=
0
;
(
i
<
p_box
->
data
.
p_stsz
->
i_sample_count
)
&&
(
i_read
>=
4
);
i
++
)
{
{
MP4_GET4BYTES
(
p_box
->
data
.
p_stsz
->
i_entry_size
[
i
]
);
MP4_GET4BYTES
(
p_box
->
data
.
p_stsz
->
i_entry_size
[
i
]
);
}
}
}
}
else
p_box
->
data
.
p_stsz
->
i_entry_size
=
NULL
;
#ifdef MP4_VERBOSE
#ifdef MP4_VERBOSE
msg_Dbg
(
p_stream
,
"read box:
\"
stsz
\"
sample-size %d sample-count %d"
,
msg_Dbg
(
p_stream
,
"read box:
\"
stsz
\"
sample-size %d sample-count %d"
,
...
...
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