Merge remote-tracking branch 'upstream/dev' into ldm-mergeDev

This commit is contained in:
Stella Lau
2017-09-06 15:56:32 -07:00
30 changed files with 2971 additions and 2597 deletions
+5 -1
View File
@@ -48,7 +48,11 @@ LIBFUZZER ?= -lFuzzer
default: all
all: round_trip simple_decompress
all: \
simple_round_trip \
stream_round_trip \
simple_decompress \
stream_decompress
%.o: %.c
$(CC) $(FUZZ_CPPFLAGS) $(FUZZ_CFLAGS) $^ -c -o $@
+1 -1
View File
@@ -39,7 +39,7 @@ int main(int argc, char const **argv) {
FILE *file;
/* Check that it is a regular file, and that the fileSize is valid */
FUZZ_ASSERT_MSG(UTIL_isRegFile(fileName), fileName);
FUZZ_ASSERT_MSG(UTIL_isRegularFile(fileName), fileName);
FUZZ_ASSERT_MSG(fileSize <= kMaxFileSize, fileName);
/* Ensure we have a large enough buffer allocated */
if (fileSize > bufferSize) {
+1 -1
View File
@@ -20,7 +20,7 @@
#include "fuzz_helpers.h"
#include "zstd.h"
static size_t const kBufSize = ZSTD_BLOCKSIZE_ABSOLUTEMAX;
static size_t const kBufSize = ZSTD_BLOCKSIZE_MAX;
static ZSTD_DStream *dstream = NULL;
static void* buf = NULL;