Commit e5655a32 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/h264_cabac: Check decode_cabac_mb_mvd() for failure

Fixes harmless integer overflow
Fixes Ticket5150

No speedloss measured, actually its slightly faster, but please benchmark & double check this
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent dcb6d5b8
......@@ -1540,8 +1540,12 @@ static int decode_cabac_mb_mvd(H264SliceContext *sl, int ctxbase, int amvd, int
int amvd1 = sl->mvd_cache[list][scan8[n] - 1][1] +\
sl->mvd_cache[list][scan8[n] - 8][1];\
\
mx += decode_cabac_mb_mvd(sl, 40, amvd0, &mpx);\
my += decode_cabac_mb_mvd(sl, 47, amvd1, &mpy);\
int mxd = decode_cabac_mb_mvd(sl, 40, amvd0, &mpx);\
int myd = decode_cabac_mb_mvd(sl, 47, amvd1, &mpy);\
if (mxd == INT_MIN || myd == INT_MIN) \
return AVERROR_INVALIDDATA; \
mx += mxd;\
my += myd;\
}
static av_always_inline int get_cabac_cbf_ctx(H264SliceContext *sl,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment