virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avfilter/vf_gblur: fix heap-buffer overflow

Browse Source 
Fixes #8282
This commit is contained in:
Paul B Mahol 2019-10-16 12:13:04 +02:00
parent e14f5fd0a6
commit 64a805883d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_gblur.c
View File

@ -236,7 +236,7 @@ static int config_input(AVFilterLink *inlink)
s->nb_planes = av_pix_fmt_count_planes(inlink->format); s->nb_planes = av_pix_fmt_count_planes(inlink->format);
s->buffer = av_malloc_array(inlink->w, inlink->h * sizeof(*s->buffer)); s->buffer = av_malloc_array(FFALIGN(inlink->w, 16), FFALIGN(inlink->h, 16) * sizeof(*s->buffer));
if (!s->buffer) if (!s->buffer)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

4
libavfilter/x86/vf_gblur.asm
View File

@ -100,7 +100,7 @@ cglobal horiz_slice, 4, 9, 9, ptr, width, height, steps, nu, bscale, x, y, step,
add widthq, remainq add widthq, remainq
cmp xq, widthq cmp xq, widthq
je .end_scalar jge .end_scalar
.loop_scalar: .loop_scalar:
; ptr[x] += nu * ptr[x-1] ; ptr[x] += nu * ptr[x-1]
@ -148,7 +148,7 @@ cglobal horiz_slice, 4, 9, 9, ptr, width, height, steps, nu, bscale, x, y, step,
jg .loop_x_back jg .loop_x_back
cmp xq, 0 cmp xq, 0
je .end_scalar_back jle .end_scalar_back
.loop_scalar_back: .loop_scalar_back:
; ptr[x-1] += nu * ptr[x] ; ptr[x-1] += nu * ptr[x]