* [FFmpeg-devel] [PATCH] avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX
@ 2024-03-12 22:57 Andreas Rheinhardt
2024-03-12 22:58 ` James Almer
2024-03-14 19:52 ` Sean McGovern
0 siblings, 2 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2024-03-12 22:57 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Affects many FATE-tests, see
http://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/avidec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index f3183b2698..b7cbf148af 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1696,7 +1696,7 @@ static int check_stream_max_drift(AVFormatContext *s)
int *idx = av_calloc(s->nb_streams, sizeof(*idx));
if (!idx)
return AVERROR(ENOMEM);
- for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1LU) {
+ for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + (uint64_t)1) {
int64_t max_dts = INT64_MIN / 2;
int64_t min_dts = INT64_MAX / 2;
int64_t max_buffer = 0;
--
2.40.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".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX
2024-03-12 22:57 [FFmpeg-devel] [PATCH] avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX Andreas Rheinhardt
@ 2024-03-12 22:58 ` James Almer
2024-03-12 23:01 ` Andreas Rheinhardt
2024-03-14 19:52 ` Sean McGovern
1 sibling, 1 reply; 5+ messages in thread
From: James Almer @ 2024-03-12 22:58 UTC (permalink / raw)
To: ffmpeg-devel
On 3/12/2024 7:57 PM, Andreas Rheinhardt wrote:
> Affects many FATE-tests, see
> http://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavformat/avidec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/avidec.c b/libavformat/avidec.c
> index f3183b2698..b7cbf148af 100644
> --- a/libavformat/avidec.c
> +++ b/libavformat/avidec.c
> @@ -1696,7 +1696,7 @@ static int check_stream_max_drift(AVFormatContext *s)
> int *idx = av_calloc(s->nb_streams, sizeof(*idx));
> if (!idx)
> return AVERROR(ENOMEM);
> - for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1LU) {
> + for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + (uint64_t)1) {
nit: 1ULL
> int64_t max_dts = INT64_MIN / 2;
> int64_t min_dts = INT64_MAX / 2;
> int64_t max_buffer = 0;
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX
2024-03-12 22:58 ` James Almer
@ 2024-03-12 23:01 ` Andreas Rheinhardt
2024-03-12 23:51 ` James Almer
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Rheinhardt @ 2024-03-12 23:01 UTC (permalink / raw)
To: ffmpeg-devel
James Almer:
> On 3/12/2024 7:57 PM, Andreas Rheinhardt wrote:
>> Affects many FATE-tests, see
>> http://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>> libavformat/avidec.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavformat/avidec.c b/libavformat/avidec.c
>> index f3183b2698..b7cbf148af 100644
>> --- a/libavformat/avidec.c
>> +++ b/libavformat/avidec.c
>> @@ -1696,7 +1696,7 @@ static int
>> check_stream_max_drift(AVFormatContext *s)
>> int *idx = av_calloc(s->nb_streams, sizeof(*idx));
>> if (!idx)
>> return AVERROR(ENOMEM);
>> - for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1LU) {
>> + for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos +
>> (uint64_t)1) {
>
> nit: 1ULL
>
The other variables are int64_t, not long long int, so using uint64_t is
appropriate.
- Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX
2024-03-12 23:01 ` Andreas Rheinhardt
@ 2024-03-12 23:51 ` James Almer
0 siblings, 0 replies; 5+ messages in thread
From: James Almer @ 2024-03-12 23:51 UTC (permalink / raw)
To: ffmpeg-devel
On 3/12/2024 8:01 PM, Andreas Rheinhardt wrote:
> James Almer:
>> On 3/12/2024 7:57 PM, Andreas Rheinhardt wrote:
>>> Affects many FATE-tests, see
>>> http://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
>>>
>>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>>> ---
>>> libavformat/avidec.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/libavformat/avidec.c b/libavformat/avidec.c
>>> index f3183b2698..b7cbf148af 100644
>>> --- a/libavformat/avidec.c
>>> +++ b/libavformat/avidec.c
>>> @@ -1696,7 +1696,7 @@ static int
>>> check_stream_max_drift(AVFormatContext *s)
>>> int *idx = av_calloc(s->nb_streams, sizeof(*idx));
>>> if (!idx)
>>> return AVERROR(ENOMEM);
>>> - for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1LU) {
>>> + for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos +
>>> (uint64_t)1) {
>>
>> nit: 1ULL
>>
>
> The other variables are int64_t, not long long int, so using uint64_t is
> appropriate.
In practice it's not only the same, but also cleaner looking and done
all across the codebase. But if you really want it to be uint64_t, then
maybe use UINT64_C(1) instead (which, fwiw, will be expanded to 1ULL or
even 1UL depending on target).
>
> - Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX
2024-03-12 22:57 [FFmpeg-devel] [PATCH] avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX Andreas Rheinhardt
2024-03-12 22:58 ` James Almer
@ 2024-03-14 19:52 ` Sean McGovern
1 sibling, 0 replies; 5+ messages in thread
From: Sean McGovern @ 2024-03-14 19:52 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Andreas:
On Tue, Mar 12, 2024 at 6:57 PM Andreas Rheinhardt
<andreas.rheinhardt@outlook.com> wrote:
>
> Affects many FATE-tests, see
> http://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavformat/avidec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/avidec.c b/libavformat/avidec.c
> index f3183b2698..b7cbf148af 100644
> --- a/libavformat/avidec.c
> +++ b/libavformat/avidec.c
> @@ -1696,7 +1696,7 @@ static int check_stream_max_drift(AVFormatContext *s)
> int *idx = av_calloc(s->nb_streams, sizeof(*idx));
> if (!idx)
> return AVERROR(ENOMEM);
> - for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1LU) {
> + for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + (uint64_t)1) {
> int64_t max_dts = INT64_MIN / 2;
> int64_t min_dts = INT64_MAX / 2;
> int64_t max_buffer = 0;
> --
> 2.40.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".
Confirming that this fixes fate-v210 (and probably many more) on my
PowerPC QEMU setup -- it was not failing on POWER7 (ppc64) or POWER9
(ppc64le) and remains so with the patch applied.
Thanks,
Sean McGovern
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-14 19:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-12 22:57 [FFmpeg-devel] [PATCH] avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX Andreas Rheinhardt
2024-03-12 22:58 ` James Almer
2024-03-12 23:01 ` Andreas Rheinhardt
2024-03-12 23:51 ` James Almer
2024-03-14 19:52 ` Sean McGovern
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git