* [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for prores @ 2021-12-15 17:37 Michael Niedermayer 2021-12-15 17:37 ` [FFmpeg-devel] [PATCH 2/2] avformat/mvdec: Use 64 bit in timestamp computation Michael Niedermayer 2021-12-16 20:04 ` [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for prores Michael Niedermayer 0 siblings, 2 replies; 5+ messages in thread From: Michael Niedermayer @ 2021-12-15 17:37 UTC (permalink / raw) To: FFmpeg development discussions and patches Fixes: Timeout Fixes: 42072/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PRORES_fuzzer-4957999452520448 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 0c59242e3e4..13766d22b99 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -193,6 +193,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_APNG: maxpixels /= 128; break; case AV_CODEC_ID_QTRLE: maxpixels /= 16; break; case AV_CODEC_ID_PAF_VIDEO: maxpixels /= 16; break; + case AV_CODEC_ID_PRORES: maxpixels /= 256; break; case AV_CODEC_ID_RASC: maxpixels /= 16; break; case AV_CODEC_ID_SANM: maxpixels /= 16; break; case AV_CODEC_ID_SCPR: maxpixels /= 32; break; -- 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] 5+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] avformat/mvdec: Use 64 bit in timestamp computation 2021-12-15 17:37 [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for prores Michael Niedermayer @ 2021-12-15 17:37 ` Michael Niedermayer 2021-12-16 0:26 ` Peter Ross 2021-12-16 20:04 ` [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for prores Michael Niedermayer 1 sibling, 1 reply; 5+ messages in thread From: Michael Niedermayer @ 2021-12-15 17:37 UTC (permalink / raw) To: FFmpeg development discussions and patches Fixes: division by zero Fixes: 42198/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-5054366405492736.fuzz Fixes: 42222/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-4561249331970048 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/mvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index 8b54a9ab045..5d184f20a49 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -381,7 +381,7 @@ static int mv_read_header(AVFormatContext *avctx) avio_skip(pb, 8); av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); - timestamp += asize / (ast->codecpar->channels * bytes_per_sample); + timestamp += asize / (ast->codecpar->channels * (uint64_t)bytes_per_sample); } } else if (!version && avio_rb16(pb) == 3) { avio_skip(pb, 4); -- 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] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] avformat/mvdec: Use 64 bit in timestamp computation 2021-12-15 17:37 ` [FFmpeg-devel] [PATCH 2/2] avformat/mvdec: Use 64 bit in timestamp computation Michael Niedermayer @ 2021-12-16 0:26 ` Peter Ross 2021-12-16 20:03 ` Michael Niedermayer 0 siblings, 1 reply; 5+ messages in thread From: Peter Ross @ 2021-12-16 0:26 UTC (permalink / raw) To: FFmpeg development discussions and patches [-- Attachment #1.1: Type: text/plain, Size: 1340 bytes --] On Wed, Dec 15, 2021 at 06:37:13PM +0100, Michael Niedermayer wrote: > Fixes: division by zero > Fixes: 42198/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-5054366405492736.fuzz > Fixes: 42222/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-4561249331970048 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/mvdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c > index 8b54a9ab045..5d184f20a49 100644 > --- a/libavformat/mvdec.c > +++ b/libavformat/mvdec.c > @@ -381,7 +381,7 @@ static int mv_read_header(AVFormatContext *avctx) > avio_skip(pb, 8); > av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); > av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); > - timestamp += asize / (ast->codecpar->channels * bytes_per_sample); > + timestamp += asize / (ast->codecpar->channels * (uint64_t)bytes_per_sample); > } > } else if (!version && avio_rb16(pb) == 3) { > avio_skip(pb, 4); > -- > 2.17.1 please apply. -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) [-- 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] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] avformat/mvdec: Use 64 bit in timestamp computation 2021-12-16 0:26 ` Peter Ross @ 2021-12-16 20:03 ` Michael Niedermayer 0 siblings, 0 replies; 5+ messages in thread From: Michael Niedermayer @ 2021-12-16 20:03 UTC (permalink / raw) To: FFmpeg development discussions and patches [-- Attachment #1.1: Type: text/plain, Size: 1579 bytes --] On Thu, Dec 16, 2021 at 11:26:23AM +1100, Peter Ross wrote: > On Wed, Dec 15, 2021 at 06:37:13PM +0100, Michael Niedermayer wrote: > > Fixes: division by zero > > Fixes: 42198/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-5054366405492736.fuzz > > Fixes: 42222/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-4561249331970048 > > > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavformat/mvdec.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c > > index 8b54a9ab045..5d184f20a49 100644 > > --- a/libavformat/mvdec.c > > +++ b/libavformat/mvdec.c > > @@ -381,7 +381,7 @@ static int mv_read_header(AVFormatContext *avctx) > > avio_skip(pb, 8); > > av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); > > av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); > > - timestamp += asize / (ast->codecpar->channels * bytes_per_sample); > > + timestamp += asize / (ast->codecpar->channels * (uint64_t)bytes_per_sample); > > } > > } else if (!version && avio_rb16(pb) == 3) { > > avio_skip(pb, 4); > > -- > > 2.17.1 > > please apply. will apply thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Never trust a computer, one day, it may think you are the virus. -- Compn [-- 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] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for prores 2021-12-15 17:37 [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for prores Michael Niedermayer 2021-12-15 17:37 ` [FFmpeg-devel] [PATCH 2/2] avformat/mvdec: Use 64 bit in timestamp computation Michael Niedermayer @ 2021-12-16 20:04 ` Michael Niedermayer 1 sibling, 0 replies; 5+ messages in thread From: Michael Niedermayer @ 2021-12-16 20:04 UTC (permalink / raw) To: FFmpeg development discussions and patches [-- Attachment #1.1: Type: text/plain, Size: 647 bytes --] On Wed, Dec 15, 2021 at 06:37:12PM +0100, Michael Niedermayer wrote: > Fixes: Timeout > Fixes: 42072/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PRORES_fuzzer-4957999452520448 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > tools/target_dec_fuzzer.c | 1 + > 1 file changed, 1 insertion(+) will apply [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB "I am not trying to be anyone's saviour, I'm trying to think about the future and not be sad" - Elon Musk [-- 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] 5+ messages in thread
end of thread, other threads:[~2021-12-16 20:04 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-12-15 17:37 [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for prores Michael Niedermayer 2021-12-15 17:37 ` [FFmpeg-devel] [PATCH 2/2] avformat/mvdec: Use 64 bit in timestamp computation Michael Niedermayer 2021-12-16 0:26 ` Peter Ross 2021-12-16 20:03 ` Michael Niedermayer 2021-12-16 20:04 ` [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for prores 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