Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
08169fc3
Commit
08169fc3
authored
Jun 14, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
matroskadec: move lace_size check up so it catches all code pathes
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
88a740af
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
matroskadec.c
libavformat/matroskadec.c
+5
-5
No files found.
libavformat/matroskadec.c
View file @
08169fc3
...
...
@@ -1975,6 +1975,11 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if
(
res
==
0
)
{
for
(
n
=
0
;
n
<
laces
;
n
++
)
{
if
(
lace_size
[
n
]
>
size
)
{
av_log
(
matroska
->
ctx
,
AV_LOG_ERROR
,
"Invalid packet size
\n
"
);
break
;
}
if
((
st
->
codec
->
codec_id
==
CODEC_ID_RA_288
||
st
->
codec
->
codec_id
==
CODEC_ID_COOK
||
st
->
codec
->
codec_id
==
CODEC_ID_SIPR
||
...
...
@@ -2044,11 +2049,6 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
uint32_t
pkt_size
=
lace_size
[
n
];
uint8_t
*
pkt_data
=
data
;
if
(
pkt_size
>
size
)
{
av_log
(
matroska
->
ctx
,
AV_LOG_ERROR
,
"Invalid packet size
\n
"
);
break
;
}
if
(
encodings
&&
encodings
->
scope
&
1
)
{
offset
=
matroska_decode_buffer
(
&
pkt_data
,
&
pkt_size
,
track
);
if
(
offset
<
0
)
...
...
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