diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-06 04:11:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-06 04:32:14 +0100 |
| commit | 69aa79365c1e8e1cb597d33e77bf1062c2ef47d4 (patch) | |
| tree | ca821e1d12fd4b12aac92ac3453d5d13b02adc13 /libavcodec/h264_ps.c | |
| parent | 15a88468aecd84ac233e0b21266a22d28307147f (diff) | |
| download | ffmpeg-69aa79365c1e8e1cb597d33e77bf1062c2ef47d4.tar.gz | |
avcodec/h264_ps: More completely check the bit depths
Fixes out of array read
Fixes: asan_static-oob_30328b6_719_cov_3325483287_H264_artifacts_motion.h264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 4070490e46..c2747ac84c 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -371,7 +371,8 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) "Different chroma and luma bit depth"); goto fail; } - if (sps->bit_depth_luma > 14U || sps->bit_depth_chroma > 14U) { + if (sps->bit_depth_luma < 8 || sps->bit_depth_luma > 14 || + sps->bit_depth_chroma < 8 || sps->bit_depth_chroma > 14) { av_log(h->avctx, AV_LOG_ERROR, "illegal bit depth value (%d, %d)\n", sps->bit_depth_luma, sps->bit_depth_chroma); goto fail; |