aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ivi_dsp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-31 15:52:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-03-31 16:35:54 +0200
commit12038ab16da2f9e007c5f3a5bacc19e61f8edfd8 (patch)
treee7c57e8f959891b4fd03da2c36ae069e430c92ea /libavcodec/ivi_dsp.c
parent874ac0b1fdc858481aa51bdc010612d9db29083b (diff)
downloadffmpeg-12038ab16da2f9e007c5f3a5bacc19e61f8edfd8.tar.gz
ividsp: zero pitch so as not to overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ivi_dsp.c')
-rw-r--r--libavcodec/ivi_dsp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c
index 0ee7035741..263c06ace3 100644
--- a/libavcodec/ivi_dsp.c
+++ b/libavcodec/ivi_dsp.c
@@ -55,6 +55,9 @@ void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
b3_ptr = plane->bands[3].buf;
for (y = 0; y < plane->height; y += 2) {
+
+ if (y+2 >= plane->height)
+ pitch= 0;
/* load storage variables with values */
if (num_bands > 0) {
b0_1 = b0_ptr[0];