aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-11 08:28:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-11 09:20:26 +0200
commitbb8ce36dc28576d2abd10afc171499d6a9ce656a (patch)
tree6903e716edcfbaf06c7b6bc42b51e655c70e1116
parent964f9ca2299431def0b3a3d57ddee5c0d4793e91 (diff)
parent5f5ada3dbf97e306a74250ba8dcf8619ad59b020 (diff)
downloadffmpeg-bb8ce36dc28576d2abd10afc171499d6a9ce656a.tar.gz
Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'
* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020': shorten: Fix out-of-array read Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/shorten.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 082019b802..c25097c6e1 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -299,7 +299,7 @@ static int decode_subframe_lpc(ShortenContext *s, int command, int channel,
} else {
/* fixed LPC coeffs */
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",
pred_order);
return AVERROR_INVALIDDATA;