Merge branch 'dev' of github.com:facebook/zstd into dev

This commit is contained in:
Yann Collet committed 2016-10-14 13:32:35 -07:00
commit 7933434fdf
2 files changed
+7 -3

No files matched your search

+3 -1
View File
@@ -1402,7 +1402,9 @@ ZSTD_DDict* ZSTD_createDDict_advanced(const void* dict, size_t dictSize, ZSTD_cu
return NULL;
}
memcpy(dictContent, dict, dictSize);
if (dictSize) {
memcpy(dictContent, dict, dictSize);
}
{ size_t const errorCode = ZSTD_decompressBegin_usingDict(dctx, dictContent, dictSize);
if (ZSTD_isError(errorCode)) {
ZSTD_free(dictContent, customMem);