summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Dymond <cmeister2@gmail.com>2019-06-28 23:23:06 (GMT)
committerMax Dymond <cmeister2@gmail.com>2019-06-28 23:23:06 (GMT)
commite2a33f12e1198d3f5de374519d7a034a8736f6c8 (patch)
treef86041d9e2ddd2b90c0d0f4d45ef25575d15b32a
parent02b5b3c242fd4131983152f0dd422429e6702923 (diff)
downloadlz4-e2a33f12e1198d3f5de374519d7a034a8736f6c8.zip
lz4-e2a33f12e1198d3f5de374519d7a034a8736f6c8.tar.gz
lz4-e2a33f12e1198d3f5de374519d7a034a8736f6c8.tar.bz2
More markups for style changes
-rw-r--r--ossfuzz/Makefile14
-rw-r--r--ossfuzz/compress_fuzzer.c19
-rw-r--r--ossfuzz/decompress_fuzzer.c22
-rw-r--r--ossfuzz/testinput.h12
4 files changed, 39 insertions, 28 deletions
diff --git a/ossfuzz/Makefile b/ossfuzz/Makefile
index 1480ccb..7812c41 100644
--- a/ossfuzz/Makefile
+++ b/ossfuzz/Makefile
@@ -31,28 +31,28 @@ LIB_FUZZING_ENGINE ?= standaloneengine.o
DEBUGLEVEL?= 1
DEBUGFLAGS = -g -DLZ4_DEBUG=$(DEBUGLEVEL)
-CFLAGS += -I$(LZ4DIR) $(DEBUGFLAGS) $(MOREFLAGS)
-CXXFLAGS += -I$(LZ4DIR) $(DEBUGFLAGS) $(MOREFLAGS)
-CPPFLAGS += -DXXH_NAMESPACE=LZ4_
+LZ4_CFLAGS = $(CFLAGS) $(DEBUGFLAGS) $(MOREFLAGS)
+LZ4_CXXFLAGS = $(CXXFLAGS) $(DEBUGFLAGS) $(MOREFLAGS)
+LZ4_CPPFLAGS = $(CPPFLAGS) -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_
include ../Makefile.inc
# Include a rule to build the static library if calling this target
# directly.
$(LZ4DIR)/liblz4.a:
- $(MAKE) -C $(LZ4DIR) CFLAGS="$(CFLAGS)" liblz4.a
+ $(MAKE) -C $(LZ4DIR) CFLAGS="$(LZ4_CFLAGS)" liblz4.a
%.o: %.c
- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+ $(CC) -c $(LZ4_CFLAGS) $(LZ4_CPPFLAGS) $< -o $@
# Generic rule for generating fuzzers
%_fuzzer: %_fuzzer.o $(LZ4DIR)/liblz4.a
# Compile the standalone code just in case. The OSS-Fuzz code might
# override the LIB_FUZZING_ENGINE value to "-fsanitize=fuzzer"
- $(CC) -c $(CFLAGS) $(CPPFLAGS) standaloneengine.c -o standaloneengine.o
+ $(CC) -c $(LZ4_CFLAGS) $(LZ4_CPPFLAGS) standaloneengine.c -o standaloneengine.o
# Now compile the actual fuzzer.
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIB_FUZZING_ENGINE) $^ -o $@$(EXT)
+ $(CXX) $(LZ4_CXXFLAGS) $(LZ4_CPPFLAGS) $(LDFLAGS) $(LIB_FUZZING_ENGINE) $^ -o $@$(EXT)
%_fuzzer_clean:
$(RM) $*_fuzzer $*_fuzzer.o standaloneengine.o
diff --git a/ossfuzz/compress_fuzzer.c b/ossfuzz/compress_fuzzer.c
index 28610ad..3908534 100644
--- a/ossfuzz/compress_fuzzer.c
+++ b/ossfuzz/compress_fuzzer.c
@@ -10,17 +10,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
size_t const compressed_dest_size = LZ4_compressBound(size);
char *const dest_buffer = (char *)malloc(compressed_dest_size);
- if (dest_buffer != NULL)
- {
- // Allocation succeeded, try compressing the incoming data.
- int result = LZ4_compress_default((const char*)data,
- dest_buffer,
- size,
- compressed_dest_size);
- CHECK(result != 0);
+ CHECK(dest_buffer != NULL);
- free(dest_buffer);
- }
+ // Allocation succeeded, try compressing the incoming data.
+ int result = LZ4_compress_default((const char*)data,
+ dest_buffer,
+ size,
+ compressed_dest_size);
+ CHECK(result != 0);
+
+ free(dest_buffer);
return 0;
}
diff --git a/ossfuzz/decompress_fuzzer.c b/ossfuzz/decompress_fuzzer.c
index 1fa2b1a..e6e14c4 100644
--- a/ossfuzz/decompress_fuzzer.c
+++ b/ossfuzz/decompress_fuzzer.c
@@ -7,22 +7,22 @@
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
+ // TODO: Size input buffer pseudo-randomly based on seed extracted from input
size_t const buffer_size = 10 * 1024 * 1024;
char *const dest_buffer = (char *)malloc(buffer_size);
- if (dest_buffer != NULL)
- {
- // Allocation succeeded, try decompressing the incoming data.
- int result = LZ4_decompress_safe((const char*)data,
- dest_buffer,
- size,
- buffer_size);
+ CHECK(dest_buffer != NULL);
- // Ignore the result of decompression.
- (void)result;
+ // Allocation succeeded, try decompressing the incoming data.
+ int result = LZ4_decompress_safe((const char*)data,
+ dest_buffer,
+ size,
+ buffer_size);
- free(dest_buffer);
- }
+ // Ignore the result of decompression.
+ (void)result;
+
+ free(dest_buffer);
return 0;
}
diff --git a/ossfuzz/testinput.h b/ossfuzz/testinput.h
index 8da6215..0e50a3c 100644
--- a/ossfuzz/testinput.h
+++ b/ossfuzz/testinput.h
@@ -1,3 +1,15 @@
+#ifndef TESTINPUT_H_INCLUDED
+#define TESTINPUT_H_INCLUDED
+
#include <inttypes.h>
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
+
+#if defined(__cplusplus)
+}
+#endif
+#endif