avcodec/shorten: More complete pred_order check

Fixes CID1239055

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 294469416d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-15 17:02:28 +02:00
parent 71689e7863
commit cb0cc44f3a

View File

@@ -277,7 +277,7 @@ static int decode_subframe_lpc(ShortenContext *s, int command, int channel,
if (command == FN_QLPC) { if (command == FN_QLPC) {
/* read/validate prediction order */ /* read/validate prediction order */
pred_order = get_ur_golomb_shorten(&s->gb, LPCQSIZE); pred_order = get_ur_golomb_shorten(&s->gb, LPCQSIZE);
if (pred_order > s->nwrap) { if ((unsigned)pred_order > s->nwrap) {
av_log(s->avctx, AV_LOG_ERROR, "invalid pred_order %d\n", av_log(s->avctx, AV_LOG_ERROR, "invalid pred_order %d\n",
pred_order); pred_order);
return AVERROR(EINVAL); return AVERROR(EINVAL);