[FFmpeg-devel] [PATCH 2/4] avformat/iamf_reader: return REDO on failure to read

Michael Niedermayer michael at niedermayer.cc
Thu Mar 21 03:15:15 EET 2024


Fixes: null pointer derference
Fixes: 67007/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-6522819204677632

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavformat/iamf_reader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/iamf_reader.c b/libavformat/iamf_reader.c
index 42d20f1ae6..a06aa98cdb 100644
--- a/libavformat/iamf_reader.c
+++ b/libavformat/iamf_reader.c
@@ -26,6 +26,7 @@
 #include "libavcodec/packet.h"
 #include "avformat.h"
 #include "avio_internal.h"
+#include "demux.h"
 #include "iamf.h"
 #include "iamf_parse.h"
 #include "iamf_reader.h"
@@ -322,7 +323,7 @@ int ff_iamf_read_packet(AVFormatContext *s, IAMFDemuxContext *c,
             break;
     }
 
-    return read;
+    return FFERROR_REDO;
 }
 
 void ff_iamf_read_deinit(IAMFDemuxContext *c)
-- 
2.17.1



More information about the ffmpeg-devel mailing list