[FFmpeg-devel] [PATCH 1/2] avcodec/avcodec: fix UB NULL+0

[FFmpeg-devel] [PATCH 1/2] avcodec/avcodec: fix UB NULL+0

[Zhao Zhili]

From: Zhao Zhili <zhilizhao@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

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/avcodec: fix UB NULL+0

["zhilizhao(赵志立)"]

> On Apr 12, 2023, at 01:49, Zhao Zhili <quinkblack@foxmail.com> wrote:
> 
> From: Zhao Zhili <zhilizhao@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.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/avcodec: fix UB NULL+0

["zhilizhao(赵志立)"]

> On Apr 26, 2023, at 20:49, zhilizhao(赵志立) <quinkblack@foxmail.com> wrote:
> 
>> On Apr 12, 2023, at 01:49, Zhao Zhili <quinkblack@foxmail.com> wrote:
>> 
>> From: Zhao Zhili <zhilizhao@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.

Applied as 36a56d3c and 0d40711f.

> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@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-request@ffmpeg.org with subject "unsubscribe".