Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
7061a05d
Commit
7061a05d
authored
Mar 16, 2008
by
Rémi Denis-Courmont
Browse files
Handle memory errors in MP4 ctts - refs #1508
parent
cd74f7f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/demux/mp4/libmp4.c
View file @
7061a05d
...
...
@@ -826,9 +826,16 @@ error:
MP4_READBOX_EXIT
(
code
);
}
static
void
MP4_FreeBox_ctts
(
MP4_Box_t
*
p_box
)
{
FREENULL
(
p_box
->
data
.
p_ctts
->
i_sample_count
);
FREENULL
(
p_box
->
data
.
p_ctts
->
i_sample_offset
);
}
static
int
MP4_ReadBox_ctts
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
{
unsigned
int
i
;
unsigned
int
i
,
code
=
0
;
MP4_READBOX_ENTER
(
MP4_Box_data_ctts_t
);
MP4_GETVERSIONFLAGS
(
p_box
->
data
.
p_ctts
);
...
...
@@ -839,26 +846,29 @@ static int MP4_ReadBox_ctts( stream_t *p_stream, MP4_Box_t *p_box )
calloc
(
p_box
->
data
.
p_ctts
->
i_entry_count
,
sizeof
(
uint32_t
)
);
p_box
->
data
.
p_ctts
->
i_sample_offset
=
calloc
(
p_box
->
data
.
p_ctts
->
i_entry_count
,
sizeof
(
uint32_t
)
);
if
(
(
p_box
->
data
.
p_ctts
->
i_sample_count
==
NULL
)
||
(
p_box
->
data
.
p_ctts
->
i_sample_offset
==
NULL
)
)
{
MP4_FreeBox_ctts
(
p_box
);
goto
error
;
}
for
(
i
=
0
;
(
i
<
p_box
->
data
.
p_ctts
->
i_entry_count
)
&&
(
i_read
>=
8
);
i
++
)
{
MP4_GET4BYTES
(
p_box
->
data
.
p_ctts
->
i_sample_count
[
i
]
);
MP4_GET4BYTES
(
p_box
->
data
.
p_ctts
->
i_sample_offset
[
i
]
);
}
code
=
1
;
#ifdef MP4_VERBOSE
msg_Dbg
(
p_stream
,
"read box:
\"
ctts
\"
entry-count %d"
,
p_box
->
data
.
p_ctts
->
i_entry_count
);
#endif
MP4_READBOX_EXIT
(
1
);
error:
MP4_READBOX_EXIT
(
code
);
}
static
void
MP4_FreeBox_ctts
(
MP4_Box_t
*
p_box
)
{
FREENULL
(
p_box
->
data
.
p_ctts
->
i_sample_count
);
FREENULL
(
p_box
->
data
.
p_ctts
->
i_sample_offset
);
}
static
int
MP4_ReadLengthDescriptor
(
uint8_t
**
pp_peek
,
int64_t
*
i_read
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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