ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix scope of scan-build tests

Browse Source 
exclude zlib code
This commit is contained in:
Yann Collet
2018-08-15 17:41:44 -07:00
parent da55865e47
commit 5291d9ac31
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+6 -5
View File
@@ -32,7 +32,7 @@ all: allmost examples manual contrib
.PHONY: allmost .PHONY: allmost
allmost: allzstd zlibwrapper allmost: allzstd zlibwrapper
#skip zwrapper, can't build that on alternate architectures without the proper zlib installed # skip zwrapper, can't build that on alternate architectures without the proper zlib installed
.PHONY: allzstd .PHONY: allzstd
allzstd: lib allzstd: lib
$(MAKE) -C $(PRGDIR) all $(MAKE) -C $(PRGDIR) all
@@ -44,8 +44,7 @@ all32:
$(MAKE) -C $(TESTDIR) all32 $(MAKE) -C $(TESTDIR) all32
.PHONY: lib lib-release libzstd.a .PHONY: lib lib-release libzstd.a
lib : libzstd.a lib lib-release :
lib lib-release libzstd.a:
@$(MAKE) -C $(ZSTDDIR) $@ @$(MAKE) -C $(ZSTDDIR) $@
.PHONY: zstd zstd-release .PHONY: zstd zstd-release
@@ -59,7 +58,7 @@ zstdmt:
cp $(PRGDIR)/zstd$(EXT) ./zstdmt$(EXT) cp $(PRGDIR)/zstd$(EXT) ./zstdmt$(EXT)
.PHONY: zlibwrapper .PHONY: zlibwrapper
zlibwrapper: libzstd.a zlibwrapper: lib
$(MAKE) -C $(ZWRAPDIR) all $(MAKE) -C $(ZWRAPDIR) all
.PHONY: test .PHONY: test
@@ -351,7 +350,9 @@ bmi32build: clean
$(CC) -v $(CC) -v
CFLAGS="-O3 -mbmi -m32 -Werror" $(MAKE) -C $(TESTDIR) test CFLAGS="-O3 -mbmi -m32 -Werror" $(MAKE) -C $(TESTDIR) test
# static analyzer test uses clang's scan-build
# does not analyze zlibWrapper, due to detected issues in zlib source code
staticAnalyze: staticAnalyze:
$(CC) -v $(CC) -v
CC=$(CC) CPPFLAGS=-g scan-build --status-bugs -v $(MAKE) all CC=$(CC) CPPFLAGS=-g scan-build --status-bugs -v $(MAKE) allzstd examples contrib
endif endif
lib/decompress/zstd_decompress.c
+1
View File
@@ -2399,6 +2399,7 @@ static size_t ZSTD_initDDict_internal(ZSTD_DDict* ddict,
if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dict) || (!dictSize)) { if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dict) || (!dictSize)) {
ddict->dictBuffer = NULL; ddict->dictBuffer = NULL;
ddict->dictContent = dict; ddict->dictContent = dict;
if (!dict) dictSize = 0;
} else { } else {
void* const internalBuffer = ZSTD_malloc(dictSize, ddict->cMem); void* const internalBuffer = ZSTD_malloc(dictSize, ddict->cMem);
ddict->dictBuffer = internalBuffer; ddict->dictBuffer = internalBuffer;