[FFmpeg-devel] rebase bugs?

[Michael Niedermayer]

Hi all

it didnt take long for something interresting to happen:

Heres my local pr/20134

git log origin/master..fforge/pr/20134 --oneline
a99fa230adb (fforge/pr/20134, fforge-michaelni/ff-tmp-uninit-ut-vlc-ffv1) avcodec/ffv1: Clear state on alloc
006125030a0 avcodec/utvideodec: Set B for the width= 1 case

also
git log --grep "Set B for" fforge/pr/20134 --oneline
006125030a0 avcodec/utvideodec: Set B for the width= 1 case
git log --grep "Clear state on alloc" fforge/pr/20134 --oneline
a99fa230adb (fforge/pr/20134, fforge-michaelni/ff-tmp-uninit-ut-vlc-ffv1) avcodec/ffv1: Clear state on alloc

so far so good

explain this:

git log --grep "Set B for" origin/master  --oneline
27a541bb4cc avcodec/utvideodec: Set B for the width= 1 case
032dfe8584c avcodec/utvideodec: Set B for the width= 1 case

git log --grep "Clear state on alloc" origin/master  --oneline
85a2beaa811 avcodec/ffv1: Clear state on alloc
70fc46d1856 avcodec/ffv1: Clear state on alloc

also not signed, not even with forgejos key:

git log --show-signature  --grep "Clear state on alloc" origin/master  --pretty=fuller
commit 85a2beaa811cda7ddfb1f5be133268e364395f0e
Author:     Michael Niedermayer <michael at niedermayer.cc>
AuthorDate: Wed Aug 6 13:36:06 2025 +0200
Commit:     michaelni <michael at niedermayer.cc>
CommitDate: Thu Aug 7 19:45:04 2025 +0000

    avcodec/ffv1: Clear state on alloc

    Fixes: use of uninitialized memory
    Fixes: 428969823/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_DEC_fuzzer-5909681623334912

    Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
    Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

commit 70fc46d185663dbea0995bf868d66b58b388119e
Author:     Michael Niedermayer <michael at niedermayer.cc>
AuthorDate: Wed Aug 6 13:36:06 2025 +0200
Commit:     michaelni <michael at niedermayer.cc>
CommitDate: Thu Aug 7 19:44:59 2025 +0000

    avcodec/ffv1: Clear state on alloc

    Fixes: use of uninitialized memory
    Fixes: 428969823/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_DEC_fuzzer-5909681623334912

    Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
    Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>



-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No snowflake in an avalanche ever feels responsible. -- Voltaire
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250809/f2822509/attachment.sig>