highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/targa_y216dec: Fix width type

Browse Source 
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>
(cherry picked from commit 3e56db892600c2fbe34782c6140f1ee832a2c344)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-05-07 03:49:06 +02:00
parent 91394cc4da
commit d2dba39204
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/targa_y216dec.c
View File

@ -35,7 +35,8 @@ static int y216_decode_frame(AVCodecContext *avctx, void *data,
{ {
AVFrame *pic = data; AVFrame *pic = data;
const uint16_t *src = (uint16_t *)avpkt->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; int i, j, ret;
if (avpkt->size < 4 * avctx->height * aligned_width) { if (avpkt->size < 4 * avctx->height * aligned_width) {