History

Add support for building fuzzer tools for an individual demuxer

Michael Niedermayer committed 6 years ago

Commit d40679d1 parent 86b485b3 files · +15 −1Browse files

Unified · Split

3 files
  1. Makefile +4 −0
  2. tools/Makefile +3 −0
  3. tools/target_dem_fuzzer.c +8 −1
Makefile+4−0
@@ -53,6 +53,9 @@ target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS) · 52 unmodified lines
5353 tools/target_bsf_%_fuzzer$(EXESUF): tools/target_bsf_%_fuzzer.o $(FF_DEP_LIBS)
5454 $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
5555
56+target_dem_%_fuzzer$(EXESUF): target_dem_%_fuzzer.o $(FF_DEP_LIBS)
57+ $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
58+
5659 tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS)
5760 $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
5861
@@ -63,6 +66,7 @@ tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS) · 4 unmodified lines
6366 tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
6467 tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
6568 tools/target_dec_%_fuzzer$(EXESUF): $(FF_DEP_LIBS)
69+tools/target_dem_%_fuzzer$(EXESUF): $(FF_DEP_LIBS)
6670
6771 CONFIGURABLE_COMPONENTS = \
6872 $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \
tools/Makefile+3−0
@@ -8,6 +8,9 @@ tools/target_dec_%_fuzzer.o: tools/target_dec_fuzzer.c · 7 unmodified lines
88 tools/target_bsf_%_fuzzer.o: tools/target_bsf_fuzzer.c
99 $(COMPILE_C) -DFFMPEG_BSF=$*
1010
11+tools/target_dem_%_fuzzer.o: tools/target_dem_fuzzer.c
12+ $(COMPILE_C) -DFFMPEG_DEMUXER=$* -DIO_FLAT=0
13+
1114 tools/target_dem_fuzzer.o: tools/target_dem_fuzzer.c
1215 $(COMPILE_C) -DIO_FLAT=1
1316
tools/target_dem_fuzzer.c+8−1
@@ -103,8 +103,15 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { · 102 unmodified lines
103103 static int c;
104104 int seekable = 0;
105105 int ret;
106+ AVInputFormat *fmt = NULL;
106107
107108 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
108115 av_register_all();
109116 avcodec_register_all();
110117 av_log_set_level(AV_LOG_PANIC);
@@ -166,7 +173,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { · 55 unmodified lines
166173
167174 avfmt->pb = fuzzed_pb;
168175
169− ret = avformat_open_input(&avfmt, filename, NULL, NULL);
176+ ret = avformat_open_input(&avfmt, filename, fmt, NULL);
170177 if (ret < 0) {
171178 av_freep(&fuzzed_pb->buffer);
172179 av_freep(&fuzzed_pb);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t