aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-30 01:26:22 +0000
committerReinhard Tartler <siretart@tauware.de>2012-03-18 17:50:31 +0100
commit737bea21b6c2c1d4dca0b7b18824c0a3205556d2 (patch)
tree59948e4ee3fb0b4626b12987214abb4f870be54c
parentaa9e308580dc929d920c93b130e10153414a9ffb (diff)
downloadffmpeg-737bea21b6c2c1d4dca0b7b18824c0a3205556d2.tar.gz
shorten: Fix out of bound writes in fix_bitshift()
The data pointers s->decoded[*] already take into account s->nwrap. Signed-off-by: Janne Grunau <janne-libav@jannau.net> (cherry picked from commit 5f05cf4ea9aaafed8edcabe785c2719786103ec1) Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/shorten.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 3d441e4f5d..13381f6c95 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -155,7 +155,7 @@ static void fix_bitshift(ShortenContext *s, int32_t *buffer)
if (s->bitshift != 0)
for (i = 0; i < s->blocksize; i++)
- buffer[s->nwrap + i] <<= s->bitshift;
+ buffer[i] <<= s->bitshift;
}