virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avcodec/dpx: Move need_align to act per line

Browse Source 
Fixes out of array read
Fixes: 61cf123c081ee2bb774d307c75bdb99e/asan_heap-oob_1224f76_5546_bee833ffae73f752b489b9eeaac52db7.dpx

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c8aaae8e0f)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-11-14 14:29:02 +01:00
parent ec1f59150d
commit d61c3d1fca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dpx.c
View File

@ -348,11 +348,11 @@ static int decode_frame(AVCodecContext *avctx,
// For 12 bit, ignore alpha // For 12 bit, ignore alpha
if (elements == 4) if (elements == 4)
buf += 2; buf += 2;
// Jump to next aligned position
buf += need_align;
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
ptr[i] += p->linesize[i]; ptr[i] += p->linesize[i];
// Jump to next aligned position
buf += need_align;
} }
break; break;
case 16: case 16: