diff -r 2da754532dd3 -r 69de49c4e39c contrib/python-zstandard/zstd/decompress/zstd_ddict.c --- a/contrib/python-zstandard/zstd/decompress/zstd_ddict.c Sun Sep 15 00:07:30 2019 -0400 +++ b/contrib/python-zstandard/zstd/decompress/zstd_ddict.c Sun Sep 15 20:04:00 2019 -0700 @@ -105,9 +105,9 @@ ddict->dictID = MEM_readLE32((const char*)ddict->dictContent + ZSTD_FRAMEIDSIZE); /* load entropy tables */ - CHECK_E( ZSTD_loadDEntropy(&ddict->entropy, - ddict->dictContent, ddict->dictSize), - dictionary_corrupted ); + RETURN_ERROR_IF(ZSTD_isError(ZSTD_loadDEntropy( + &ddict->entropy, ddict->dictContent, ddict->dictSize)), + dictionary_corrupted); ddict->entropyPresent = 1; return 0; } @@ -133,7 +133,7 @@ ddict->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001); /* cover both little and big endian */ /* parse dictionary content */ - CHECK_F( ZSTD_loadEntropy_intoDDict(ddict, dictContentType) ); + FORWARD_IF_ERROR( ZSTD_loadEntropy_intoDDict(ddict, dictContentType) ); return 0; }