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
397d194e
Commit
397d194e
authored
Oct 09, 2011
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prores: check slice mb_y against mb_height
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
e1b2f6ec
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
proresdec_gpl.c
libavcodec/proresdec_gpl.c
+10
-1
No files found.
libavcodec/proresdec_gpl.c
View file @
397d194e
...
@@ -223,6 +223,9 @@ static int decode_picture_header(AVCodecContext *avctx, const uint8_t *buf, cons
...
@@ -223,6 +223,9 @@ static int decode_picture_header(AVCodecContext *avctx, const uint8_t *buf, cons
}
}
ctx
->
mb_width
=
(
avctx
->
width
+
15
)
>>
4
;
ctx
->
mb_width
=
(
avctx
->
width
+
15
)
>>
4
;
if
(
ctx
->
frame_type
)
ctx
->
mb_height
=
(
avctx
->
height
+
31
)
>>
5
;
else
ctx
->
mb_height
=
(
avctx
->
height
+
15
)
>>
4
;
ctx
->
mb_height
=
(
avctx
->
height
+
15
)
>>
4
;
slice_count
=
AV_RB16
(
buf
+
5
);
slice_count
=
AV_RB16
(
buf
+
5
);
...
@@ -282,6 +285,12 @@ static int decode_picture_header(AVCodecContext *avctx, const uint8_t *buf, cons
...
@@ -282,6 +285,12 @@ static int decode_picture_header(AVCodecContext *avctx, const uint8_t *buf, cons
}
}
}
}
if
(
mb_x
||
mb_y
!=
ctx
->
mb_height
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"error wrong mb count y %d h %d
\n
"
,
mb_y
,
ctx
->
mb_height
);
return
-
1
;
}
return
pic_data_size
;
return
pic_data_size
;
}
}
...
...
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