diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-02-10 14:11:44 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-02-10 14:11:44 +0100 |
| commit | b160a57ce33ede4ae86f8d842ed7e3782ef441f5 (patch) | |
| tree | ce41f507fa9909d68c47451010a982ee03474445 | |
| parent | 63931198cd48c40d1ee790906be91a4cd9dff707 (diff) | |
Prevent reader_util.c from exit()'ing if maximum flow count reached.fix/tls-memleaks
This confuses the fuzzer.
* Improved fuzz/Makefile.am to use LDADD for ../example/libndpiReader.a instead of LDFLAGS.
That way, fuzz_ndpi_reader re-links to ../example/libndpiReader.a if something changed there.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | example/reader_util.c | 2 | ||||
| -rw-r--r-- | fuzz/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/example/reader_util.c b/example/reader_util.c index 86ddf6ad2..e2a691576 100644 --- a/example/reader_util.c +++ b/example/reader_util.c @@ -812,7 +812,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow LOG(NDPI_LOG_ERROR, "maximum flow count (%u) has been exceeded\n", workflow->prefs.max_ndpi_flows); - exit(-1); + return NULL; } else { struct ndpi_flow_info *newflow = (struct ndpi_flow_info*)ndpi_malloc(sizeof(struct ndpi_flow_info)); diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am index b70eae2d8..7858c3371 100644 --- a/fuzz/Makefile.am +++ b/fuzz/Makefile.am @@ -15,8 +15,8 @@ fuzz_process_packet_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ fuzz_ndpi_reader_SOURCES = fuzz_ndpi_reader.c fuzz_ndpi_reader_CFLAGS = -I../example/ -fuzz_ndpi_reader_LDADD = ../src/lib/libndpi.a -fuzz_ndpi_reader_LDFLAGS = ../example/libndpiReader.a $(PCAP_LIB) $(ADDITIONAL_LIBS) $(LIBS) +fuzz_ndpi_reader_LDADD = ../example/libndpiReader.a ../src/lib/libndpi.a +fuzz_ndpi_reader_LDFLAGS = $(PCAP_LIB) $(ADDITIONAL_LIBS) $(LIBS) if HAS_FUZZLDFLAGS fuzz_ndpi_reader_CFLAGS += $(LIB_FUZZING_ENGINE) fuzz_ndpi_reader_LDFLAGS += $(LIB_FUZZING_ENGINE) |