RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_deblock: fix posible overreads

This commit is contained in:
Paul B Mahol 2022-04-13 10:20:59 +02:00
parent b74f212b7a
commit 9a22c6508a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_deblock.c
View File

@ -337,7 +337,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
s->deblockv(dst + x * s->bpc, out->linesize[plane], s->deblockv(dst + x * s->bpc, out->linesize[plane],
FFMIN(block, height), s->ath, s->bth, s->gth, s->dth, s->max); FFMIN(block, height), s->ath, s->bth, s->gth, s->dth, s->max);
for (y = block; y < height; y += block) { for (y = block; y < height - block; y += block) {
dst += out->linesize[plane] * block; dst += out->linesize[plane] * block;
s->deblockh(dst, out->linesize[plane], s->deblockh(dst, out->linesize[plane],
@ -353,6 +353,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
s->ath, s->bth, s->gth, s->dth, s->max); s->ath, s->bth, s->gth, s->dth, s->max);
} }
} }
dst += out->linesize[plane] * block;
for (x = block; x < width; x += block)
s->deblockv(dst + x * s->bpc, out->linesize[plane],
FFMIN(block, height - y), s->ath, s->bth, s->gth, s->dth, s->max);
} }
if (in != out) if (in != out)