1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'

* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
  shorten: Fix out-of-array read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-11 08:28:41 +02:00
commit bb8ce36dc2

View File

@ -299,7 +299,7 @@ static int decode_subframe_lpc(ShortenContext *s, int command, int channel,
} else { } else {
/* fixed LPC coeffs */ /* fixed LPC coeffs */
pred_order = command; pred_order = command;
if (pred_order > FF_ARRAY_ELEMS(fixed_coeffs)) { if (pred_order >= FF_ARRAY_ELEMS(fixed_coeffs)) {
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_INVALIDDATA; return AVERROR_INVALIDDATA;