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
d8a45d2d
Commit
d8a45d2d
authored
Mar 20, 2015
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264_ps: properly check cropping parameters against overflow
CC: libav-stable@libav.org
parent
5127c00b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
4 deletions
+16
-4
h264_ps.c
libavcodec/h264_ps.c
+16
-4
No files found.
libavcodec/h264_ps.c
View file @
d8a45d2d
...
...
@@ -439,10 +439,10 @@ int ff_h264_decode_seq_parameter_set(H264Context *h)
#endif
sps
->
crop
=
get_bits1
(
&
h
->
gb
);
if
(
sps
->
crop
)
{
int
crop_left
=
get_ue_golomb
(
&
h
->
gb
);
int
crop_right
=
get_ue_golomb
(
&
h
->
gb
);
int
crop_top
=
get_ue_golomb
(
&
h
->
gb
);
int
crop_bottom
=
get_ue_golomb
(
&
h
->
gb
);
unsigned
int
crop_left
=
get_ue_golomb
(
&
h
->
gb
);
unsigned
int
crop_right
=
get_ue_golomb
(
&
h
->
gb
);
unsigned
int
crop_top
=
get_ue_golomb
(
&
h
->
gb
);
unsigned
int
crop_bottom
=
get_ue_golomb
(
&
h
->
gb
);
if
(
h
->
avctx
->
flags2
&
CODEC_FLAG2_IGNORE_CROP
)
{
av_log
(
h
->
avctx
,
AV_LOG_DEBUG
,
"discarding sps cropping, original "
...
...
@@ -469,6 +469,18 @@ int ff_h264_decode_seq_parameter_set(H264Context *h)
crop_left
);
}
if
(
INT_MAX
/
step_x
<=
crop_left
||
INT_MAX
/
step_x
-
crop_left
<=
crop_right
||
16
*
sps
->
mb_width
<=
step_x
*
(
crop_left
+
crop_right
)
||
INT_MAX
/
step_y
<=
crop_top
||
INT_MAX
/
step_y
-
crop_top
<=
crop_bottom
||
16
*
sps
->
mb_height
<=
step_y
*
(
crop_top
+
crop_bottom
))
{
av_log
(
h
->
avctx
,
AV_LOG_WARNING
,
"Invalid crop parameters
\n
"
);
if
(
h
->
avctx
->
err_recognition
&
AV_EF_EXPLODE
)
goto
fail
;
crop_left
=
crop_right
=
crop_top
=
crop_bottom
=
0
;
}
sps
->
crop_left
=
crop_left
*
step_x
;
sps
->
crop_right
=
crop_right
*
step_x
;
sps
->
crop_top
=
crop_top
*
step_y
;
...
...
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