]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Change to heap allocation, remove implicit type conversion
authorSen Huang <senhuang96@fb.com>
Mon, 4 Nov 2019 19:33:52 +0000 (14:33 -0500)
committerSen Huang <senhuang96@fb.com>
Fri, 8 Nov 2019 18:57:25 +0000 (13:57 -0500)
lib/dictBuilder/zdict.c
tests/fuzzer.c

index 863a8edf77a26f836495fdc0206fdd188d5b33e4..32f863660829d86172c6f7cef294e66d23674001 100644 (file)
@@ -104,10 +104,11 @@ size_t ZDICT_getDictHeaderSize(const void* dictBuffer, size_t dictSize)
 {
     if (dictSize <= 8 || MEM_readLE32(dictBuffer) != ZSTD_MAGIC_DICTIONARY) return 0;
 
-    {   ZSTD_entropyDTables_t dummyEntropyTables;
-        size_t headerSize;
-        dummyEntropyTables.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001);
-        headerSize = ZSTD_loadDEntropy(&dummyEntropyTables, dictBuffer, dictSize);
+    {   size_t headerSize;
+        ZSTD_entropyDTables_t* dummyEntropyTables = (ZSTD_entropyDTables_t*)malloc(sizeof(ZSTD_entropyDTables_t));
+        dummyEntropyTables->hufTable[0] = (HUF_DTable)((HufLog)*0x1000001);
+        headerSize = ZSTD_loadDEntropy(dummyEntropyTables, dictBuffer, dictSize);
+        free(dummyEntropyTables);
         return ZSTD_isError(headerSize) ? 0 : headerSize;
     }
 }
index 9be92471e33d42093dcaa04aa26186debe9ee595..9a05daab7ad9c50f9e42bb5ba17f9061789899f8 100644 (file)
@@ -1137,7 +1137,7 @@ static int basicUnitTests(U32 const seed, double compressibility)
         size_t* const samplesSizes = (size_t*) malloc(nbSamples * sizeof(size_t));
         size_t dictSize;
         U32 dictID;
-        U32 dictHeaderSize;
+        size_t dictHeaderSize;
 
         if (dictBuffer==NULL || samplesSizes==NULL) {
             free(dictBuffer);