* [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration
@ 2022-09-17 14:32 Michael Niedermayer
2022-09-17 14:32 ` [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: Use 64bit for block_duration use Michael Niedermayer
2022-09-17 14:45 ` [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration Paul B Mahol
0 siblings, 2 replies; 6+ messages in thread
From: Michael Niedermayer @ 2022-09-17 14:32 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Fixes: signed integer overflow: 3 * -2147483648 cannot be represented in type 'int'
Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6668935979728896
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavformat/aiffdec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 0487d3f0299..318e3ad742e 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -372,6 +372,8 @@ got_sound:
av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n");
return AVERROR_INVALIDDATA;
}
+ if (aiff->block_duration < 0)
+ return AVERROR_INVALIDDATA;
/* Now positioned, get the sound data start and end */
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
--
2.17.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] 6+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: Use 64bit for block_duration use
2022-09-17 14:32 [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration Michael Niedermayer
@ 2022-09-17 14:32 ` Michael Niedermayer
2022-09-17 14:45 ` Paul B Mahol
2022-09-17 14:45 ` [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration Paul B Mahol
1 sibling, 1 reply; 6+ messages in thread
From: Michael Niedermayer @ 2022-09-17 14:32 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Fixes: signed integer overflow: 3 * -2147483648 cannot be represented in type 'int'
Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6668935979728896
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavformat/aiffdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 318e3ad742e..80733e58010 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -428,7 +428,7 @@ static int aiff_read_packet(AVFormatContext *s,
pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
/* Only one stream in an AIFF file */
pkt->stream_index = 0;
- pkt->duration = (res / st->codecpar->block_align) * aiff->block_duration;
+ pkt->duration = (res / st->codecpar->block_align) * (int64_t) aiff->block_duration;
return 0;
}
--
2.17.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] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: Use 64bit for block_duration use
2022-09-17 14:32 ` [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: Use 64bit for block_duration use Michael Niedermayer
@ 2022-09-17 14:45 ` Paul B Mahol
2022-09-22 15:10 ` Michael Niedermayer
0 siblings, 1 reply; 6+ messages in thread
From: Paul B Mahol @ 2022-09-17 14:45 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On 9/17/22, Michael Niedermayer <michael@niedermayer.cc> wrote:
> Fixes: signed integer overflow: 3 * -2147483648 cannot be represented in
> type 'int'
> Fixes:
> 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6668935979728896
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavformat/aiffdec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
> index 318e3ad742e..80733e58010 100644
> --- a/libavformat/aiffdec.c
> +++ b/libavformat/aiffdec.c
> @@ -428,7 +428,7 @@ static int aiff_read_packet(AVFormatContext *s,
> pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
> /* Only one stream in an AIFF file */
> pkt->stream_index = 0;
> - pkt->duration = (res / st->codecpar->block_align) *
> aiff->block_duration;
> + pkt->duration = (res / st->codecpar->block_align) * (int64_t)
> aiff->block_duration;
> return 0;
> }
LGTM
>
> --
> 2.17.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".
>
_______________________________________________
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] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration
2022-09-17 14:32 [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration Michael Niedermayer
2022-09-17 14:32 ` [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: Use 64bit for block_duration use Michael Niedermayer
@ 2022-09-17 14:45 ` Paul B Mahol
2022-09-22 15:10 ` Michael Niedermayer
1 sibling, 1 reply; 6+ messages in thread
From: Paul B Mahol @ 2022-09-17 14:45 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On 9/17/22, Michael Niedermayer <michael@niedermayer.cc> wrote:
> Fixes: signed integer overflow: 3 * -2147483648 cannot be represented in
> type 'int'
> Fixes:
> 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6668935979728896
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavformat/aiffdec.c | 2 ++
> 1 file changed, 2 insertions(+)
>
LGTM
> diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
> index 0487d3f0299..318e3ad742e 100644
> --- a/libavformat/aiffdec.c
> +++ b/libavformat/aiffdec.c
> @@ -372,6 +372,8 @@ got_sound:
> av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid
> block_align value\n");
> return AVERROR_INVALIDDATA;
> }
> + if (aiff->block_duration < 0)
> + return AVERROR_INVALIDDATA;
>
> /* Now positioned, get the sound data start and end */
> avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
> --
> 2.17.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".
>
_______________________________________________
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] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: Use 64bit for block_duration use
2022-09-17 14:45 ` Paul B Mahol
@ 2022-09-22 15:10 ` Michael Niedermayer
0 siblings, 0 replies; 6+ messages in thread
From: Michael Niedermayer @ 2022-09-22 15:10 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 1556 bytes --]
On Sat, Sep 17, 2022 at 04:45:28PM +0200, Paul B Mahol wrote:
> On 9/17/22, Michael Niedermayer <michael@niedermayer.cc> wrote:
> > Fixes: signed integer overflow: 3 * -2147483648 cannot be represented in
> > type 'int'
> > Fixes:
> > 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6668935979728896
> >
> > Found-by: continuous fuzzing process
> > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> > libavformat/aiffdec.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
> > index 318e3ad742e..80733e58010 100644
> > --- a/libavformat/aiffdec.c
> > +++ b/libavformat/aiffdec.c
> > @@ -428,7 +428,7 @@ static int aiff_read_packet(AVFormatContext *s,
> > pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
> > /* Only one stream in an AIFF file */
> > pkt->stream_index = 0;
> > - pkt->duration = (res / st->codecpar->block_align) *
> > aiff->block_duration;
> > + pkt->duration = (res / st->codecpar->block_align) * (int64_t)
> > aiff->block_duration;
> > return 0;
> > }
>
> LGTM
will apply
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User
questions about the command line tools should be sent to the ffmpeg-user ML.
And questions about how to use libav* should be sent to the libav-user ML.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration
2022-09-17 14:45 ` [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration Paul B Mahol
@ 2022-09-22 15:10 ` Michael Niedermayer
0 siblings, 0 replies; 6+ messages in thread
From: Michael Niedermayer @ 2022-09-22 15:10 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 851 bytes --]
On Sat, Sep 17, 2022 at 04:45:52PM +0200, Paul B Mahol wrote:
> On 9/17/22, Michael Niedermayer <michael@niedermayer.cc> wrote:
> > Fixes: signed integer overflow: 3 * -2147483648 cannot be represented in
> > type 'int'
> > Fixes:
> > 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6668935979728896
> >
> > Found-by: continuous fuzzing process
> > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> > libavformat/aiffdec.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
>
> LGTM
will apply
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Dictatorship naturally arises out of democracy, and the most aggravated
form of tyranny and slavery out of the most extreme liberty. -- Plato
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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] 6+ messages in thread
end of thread, other threads:[~2022-09-22 15:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-17 14:32 [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration Michael Niedermayer
2022-09-17 14:32 ` [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: Use 64bit for block_duration use Michael Niedermayer
2022-09-17 14:45 ` Paul B Mahol
2022-09-22 15:10 ` Michael Niedermayer
2022-09-17 14:45 ` [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration Paul B Mahol
2022-09-22 15:10 ` Michael Niedermayer
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