[FFmpeg-devel] [PATCH 1/2] avcodec/avcodec: fix UB NULL+0
"zhilizhao(赵志立)"
quinkblack at foxmail.com
Wed Apr 26 15:49:25 EEST 2023
> On Apr 12, 2023, at 01:49, Zhao Zhili <quinkblack at foxmail.com> wrote:
>
> From: Zhao Zhili <zhilizhao at tencent.com>
>
> ---
> libavcodec/avcodec.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c
> index fb1362290f..5a96899d50 100644
> --- a/libavcodec/avcodec.c
> +++ b/libavcodec/avcodec.c
> @@ -44,10 +44,11 @@
>
> int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2), void *arg, int *ret, int count, int size)
> {
> - int i;
> + size_t i;
>
> for (i = 0; i < count; i++) {
> - int r = func(c, (char *)arg + i * size);
> + size_t offset = i * size;
> + int r = func(c, FF_PTR_ADD((char *)arg, offset));
> if (ret)
> ret[i] = r;
> }
> --
> 2.25.1
>
Will apply soon unless there is objection.
More information about the ffmpeg-devel
mailing list