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

This commit is contained in:
Yann Collet committed 2017-02-15 12:00:50 -08:00
commit 2252d29a5a
8 files changed
+30 -39

No files matched your search

+1 -1
View File
@@ -2512,7 +2512,7 @@ static size_t ZSTD_loadDictionaryContent(ZSTD_CCtx* zc, const void* src, size_t
return ERROR(GENERIC); /* strategy doesn't exist; impossible */
}
zc->nextToUpdate = zc->loadedDictEnd;
zc->nextToUpdate = (U32)(iend - zc->base);
return 0;
}