Commit bb8ce36d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5f5ada3d'

* commit '5f5ada3d':
  shorten: Fix out-of-array read
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 964f9ca2 5f5ada3d
...@@ -299,7 +299,7 @@ static int decode_subframe_lpc(ShortenContext *s, int command, int channel, ...@@ -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;
......
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