aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-07 03:49:06 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-07 04:11:21 +0200
commit3e56db892600c2fbe34782c6140f1ee832a2c344 (patch)
tree033fae927284c1e324e828fcf600960d07172263
parente92fb2bea1800b987ebc3cbeef9d48cfe4bcd191 (diff)
downloadffmpeg-3e56db892600c2fbe34782c6140f1ee832a2c344.tar.gz
avcodec/targa_y216dec: Fix width type
Fixes out of array access Fixes: 1376/clusterfuzz-testcase-minimized-6361794975105024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/targa_y216dec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/targa_y216dec.c b/libavcodec/targa_y216dec.c
index 21b3d35d67..443d48a92f 100644
--- a/libavcodec/targa_y216dec.c
+++ b/libavcodec/targa_y216dec.c
@@ -35,7 +35,8 @@ static int y216_decode_frame(AVCodecContext *avctx, void *data,
{
AVFrame *pic = data;
const uint16_t *src = (uint16_t *)avpkt->data;
- uint16_t *y, *u, *v, aligned_width = FFALIGN(avctx->width, 4);
+ uint16_t *y, *u, *v;
+ int aligned_width = FFALIGN(avctx->width, 4);
int i, j, ret;
if (avpkt->size < 4 * avctx->height * aligned_width) {