Unified · Split
| @@ -53,6 +53,9 @@ target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS) · 52 unmodified lines | |||
| 53 | tools/target_bsf_%_fuzzer$(EXESUF): tools/target_bsf_%_fuzzer.o $(FF_DEP_LIBS) | 53 | tools/target_bsf_%_fuzzer$(EXESUF): tools/target_bsf_%_fuzzer.o $(FF_DEP_LIBS) |
| 54 | $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) | 54 | $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) |
| 55 | 55 | ||
| 56 | target_dem_%_fuzzer$(EXESUF): target_dem_%_fuzzer.o $(FF_DEP_LIBS) | ||
| 57 | $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) | ||
| 58 | |||
| 56 | tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS) | 59 | tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS) |
| 57 | $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) | 60 | $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) |
| 58 | 61 | ||
| @@ -63,6 +66,7 @@ tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS) · 4 unmodified lines | |||
| 63 | tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) | 66 | tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) |
| 64 | tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) | 67 | tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) |
| 65 | tools/target_dec_%_fuzzer$(EXESUF): $(FF_DEP_LIBS) | 68 | tools/target_dec_%_fuzzer$(EXESUF): $(FF_DEP_LIBS) |
| 69 | tools/target_dem_%_fuzzer$(EXESUF): $(FF_DEP_LIBS) | ||
| 66 | 70 | ||
| 67 | CONFIGURABLE_COMPONENTS = \ | 71 | CONFIGURABLE_COMPONENTS = \ |
| 68 | $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \ | 72 | $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \ |
| @@ -8,6 +8,9 @@ tools/target_dec_%_fuzzer.o: tools/target_dec_fuzzer.c · 7 unmodified lines | |||
| 8 | tools/target_bsf_%_fuzzer.o: tools/target_bsf_fuzzer.c | 8 | tools/target_bsf_%_fuzzer.o: tools/target_bsf_fuzzer.c |
| 9 | $(COMPILE_C) -DFFMPEG_BSF=$* | 9 | $(COMPILE_C) -DFFMPEG_BSF=$* |
| 10 | 10 | ||
| 11 | tools/target_dem_%_fuzzer.o: tools/target_dem_fuzzer.c | ||
| 12 | $(COMPILE_C) -DFFMPEG_DEMUXER=$* -DIO_FLAT=0 | ||
| 13 | |||
| 11 | tools/target_dem_fuzzer.o: tools/target_dem_fuzzer.c | 14 | tools/target_dem_fuzzer.o: tools/target_dem_fuzzer.c |
| 12 | $(COMPILE_C) -DIO_FLAT=1 | 15 | $(COMPILE_C) -DIO_FLAT=1 |
| 13 | 16 | ||
| @@ -103,8 +103,15 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { · 102 unmodified lines | |||
| 103 | static int c; | 103 | static int c; |
| 104 | int seekable = 0; | 104 | int seekable = 0; |
| 105 | int ret; | 105 | int ret; |
| 106 | AVInputFormat *fmt = NULL; | ||
| 106 | 107 | ||
| 107 | if (!c) { | 108 | if (!c) { |
| 109 | #ifdef FFMPEG_DEMUXER | ||
| 110 | #define DEMUXER_SYMBOL0(DEMUXER) ff_##DEMUXER##_demuxer | ||
| 111 | #define DEMUXER_SYMBOL(DEMUXER) DEMUXER_SYMBOL0(DEMUXER) | ||
| 112 | extern AVInputFormat DEMUXER_SYMBOL(FFMPEG_DEMUXER); | ||
| 113 | fmt = &DEMUXER_SYMBOL(FFMPEG_DEMUXER); | ||
| 114 | #endif | ||
| 108 | av_register_all(); | 115 | av_register_all(); |
| 109 | avcodec_register_all(); | 116 | avcodec_register_all(); |
| 110 | av_log_set_level(AV_LOG_PANIC); | 117 | av_log_set_level(AV_LOG_PANIC); |
| @@ -166,7 +173,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { · 55 unmodified lines | |||
| 166 | 173 | ||
| 167 | avfmt->pb = fuzzed_pb; | 174 | avfmt->pb = fuzzed_pb; |
| 168 | 175 | ||
| 169 | ret = avformat_open_input(&avfmt, filename, NULL, NULL); | 176 | ret = avformat_open_input(&avfmt, filename, fmt, NULL); |
| 170 | if (ret < 0) { | 177 | if (ret < 0) { |
| 171 | av_freep(&fuzzed_pb->buffer); | 178 | av_freep(&fuzzed_pb->buffer); |
| 172 | av_freep(&fuzzed_pb); | 179 | av_freep(&fuzzed_pb); |