virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/vf_bitplanenoise: fix overreads

Browse Source 
Fixes #8244

(cherry picked from commit 0b56723874)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Paul B Mahol 2019-10-11 12:42:13 +02:00 committed by Michael Niedermayer
parent c72ed4f3eb
commit c1ce4fba51
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_bitplanenoise.c
View File

@ -122,7 +122,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (s->depth <= 8) { if (s->depth <= 8) {
for (plane = 0; plane < s->nb_planes; plane++) { for (plane = 0; plane < s->nb_planes; plane++) {
const int linesize = in->linesize[plane]; const int linesize = s->planeheight[plane] > 1 ? in->linesize[plane] : 0;
const int dlinesize = out->linesize[plane]; const int dlinesize = out->linesize[plane];
uint8_t *val = in->data[plane]; uint8_t *val = in->data[plane];
uint8_t *dst = s->filter ? out->data[plane]: NULL; uint8_t *dst = s->filter ? out->data[plane]: NULL;
@ -151,7 +151,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
} }
} else { } else {
for (plane = 0; plane < s->nb_planes; plane++) { for (plane = 0; plane < s->nb_planes; plane++) {
const int linesize = in->linesize[plane] / 2; const int linesize = s->planeheight[plane] > 1 ? in->linesize[plane] / 2 : 0;
const int dlinesize = out->linesize[plane] / 2; const int dlinesize = out->linesize[plane] / 2;
uint16_t *val = (uint16_t *)in->data[plane]; uint16_t *val = (uint16_t *)in->data[plane];
uint16_t *dst = s->filter ? (uint16_t *)out->data[plane] : NULL; uint16_t *dst = s->filter ? (uint16_t *)out->data[plane] : NULL;