ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Oct 17 13:05:24 2019 +0200| [0279e727e99282dfa6c7019f468cb217543be243] | committer: Michael Niedermayer
avcodec/cavsdec: Set ret on errors in decode_pic() Fixes regression and fate failure on some machienes Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0279e727e99282dfa6c7019f468cb217543be243 --- libavcodec/cavsdec.c | 16 ++++++++++++---- tests/ref/fate/cavs | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 436f902ab3..aaed807196 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1102,15 +1102,19 @@ static int decode_pic(AVSContext *h) if (check_for_slice(h)) skip_count = -1; if (h->skip_mode_flag && (skip_count < 0)) { - if (get_bits_left(&h->gb) < 1) + if (get_bits_left(&h->gb) < 1) { + ret = AVERROR_INVALIDDATA; break; + } skip_count = get_ue_golomb(&h->gb); } if (h->skip_mode_flag && skip_count--) { decode_mb_p(h, P_SKIP); } else { - if (get_bits_left(&h->gb) < 1) + if (get_bits_left(&h->gb) < 1) { + ret = AVERROR_INVALIDDATA; break; + } mb_type = get_ue_golomb(&h->gb) + P_SKIP + h->skip_mode_flag; if (mb_type > P_8X8) ret = decode_mb_i(h, mb_type - P_8X8 - 1); @@ -1125,15 +1129,19 @@ static int decode_pic(AVSContext *h) if (check_for_slice(h)) skip_count = -1; if (h->skip_mode_flag && (skip_count < 0)) { - if (get_bits_left(&h->gb) < 1) + if (get_bits_left(&h->gb) < 1) { + ret = AVERROR_INVALIDDATA; break; + } skip_count = get_ue_golomb(&h->gb); } if (h->skip_mode_flag && skip_count--) { ret = decode_mb_b(h, B_SKIP); } else { - if (get_bits_left(&h->gb) < 1) + if (get_bits_left(&h->gb) < 1) { + ret = AVERROR_INVALIDDATA; break; + } mb_type = get_ue_golomb(&h->gb) + B_SKIP + h->skip_mode_flag; if (mb_type > B_8X8) ret = decode_mb_i(h, mb_type - B_8X8 - 1); diff --git a/tests/ref/fate/cavs b/tests/ref/fate/cavs index 4c3d127fa3..89c2b4b0b4 100644 --- a/tests/ref/fate/cavs +++ b/tests/ref/fate/cavs @@ -172,4 +172,4 @@ 0, 166, 166, 1, 622080, 0x05496a5d 0, 167, 167, 1, 622080, 0xdcb4cee8 0, 168, 168, 1, 622080, 0xb41172e5 -0, 169, 169, 1, 622080, 0x26146e0b +0, 169, 169, 1, 622080, 0x84ff3af9 _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
