diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-28 10:54:35 +0100 |
|---|---|---|
| committer | Sean McGovern <gseanmcg@gmail.com> | 2014-04-14 16:55:38 -0400 |
| commit | 175b53d051cf9e17583106c828c35d169f335ea3 (patch) | |
| tree | 4a92d95a9285c6fe020fbe1294c33b4d55c2d4cb | |
| parent | 7f604a048e9b6128cdf9ce7e95f21d1a9822ba39 (diff) | |
| download | ffmpeg-175b53d051cf9e17583106c828c35d169f335ea3.tar.gz | |
h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3
Higher modes are not allowed for 16x16/chroma, which is what this
function is used for. Otherwise this function would return 0 (vertical
prediction) for invalid higher modes, which could result in invalid
reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 38764d1814..f5f7de4b41 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -128,10 +128,10 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h) int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma) { MpegEncContext *const s = &h->s; - static const int8_t top[7] = { LEFT_DC_PRED8x8, 1, -1, -1 }; - static const int8_t left[7] = { TOP_DC_PRED8x8, -1, 2, -1, DC_128_PRED8x8 }; + static const int8_t top[4] = { LEFT_DC_PRED8x8, 1, -1, -1 }; + static const int8_t left[5] = { TOP_DC_PRED8x8, -1, 2, -1, DC_128_PRED8x8 }; - if (mode > 6U) { + if (mode > 3U) { av_log(h->s.avctx, AV_LOG_ERROR, "out of range intra chroma pred mode at %d %d\n", s->mb_x, s->mb_y); |