On Tue, Mar 1, 2022 at 3:23 PM James Almer <jamr...@gmail.com> wrote:
> Signed-off-by: James Almer <jamr...@gmail.com>
> ---
> libavfilter/framepool.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c
> index 5b510c9af9..cf6a1d0ea0 100644
> --- a/libavfilter/framepool.c
> +++ b/libavfilter/framepool.c
> @@ -57,6 +57,8 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef*
> (*alloc)(size_t size),
> int i, ret;
> FFFramePool *pool;
> const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format);
> + ptrdiff_t linesizes[4];
> + size_t sizes[4];
>
> if (!desc)
> return NULL;
> @@ -89,13 +91,19 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef*
> (*alloc)(size_t size),
> }
> }
>
> - for (i = 0; i < 4 && pool->linesize[i]; i++) {
> - int h = pool->height;
> - if (i == 1 || i == 2)
> - h = AV_CEIL_RSHIFT(h, desc->log2_chroma_h);
> + for (i = 0; i < 4; i++)
> + linesizes[i] = pool->linesize[i];
>
> - pool->pools[i] = av_buffer_pool_init(pool->linesize[i] * h +
> align,
> - alloc);
> + if (av_image_fill_plane_sizes(sizes, pool->format,
> + FFALIGN(pool->height, align),
>
This is not needed for height.
Original reporter never posted valgrind report of bug.
> + linesizes) < 0) {
> + goto fail;
> + }
> +
> + for (i = 0; i < 4 && sizes[i]; i++) {
> + if (sizes[i] > SIZE_MAX - align)
> + goto fail;
> + pool->pools[i] = av_buffer_pool_init(sizes[i] + align, alloc);
> if (!pool->pools[i])
> goto fail;
> }
> --
> 2.35.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
