sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-12-09 00:03:18 -05:00
Code Issues Projects Releases Wiki Activity

Fix COVER_optimizeTrainFromBuffer() resource leaks

Browse Source 
Thanks to @nemequ for reporting the resource leaks.
This commit is contained in:
Nick Terrell 2017-03-02 15:54:39 -08:00
parent fdb0fd34b3
commit 976e325b2e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/dictBuilder/cover.c
View File

@ -966,6 +966,7 @@ ZDICTLIB_API size_t COVER_optimizeTrainFromBuffer(void *dictBuffer,
if (!COVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples, d)) { if (!COVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples, d)) {
LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to initialize context\n"); LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to initialize context\n");
COVER_best_destroy(&best); COVER_best_destroy(&best);
POOL_free(pool);
return ERROR(GENERIC); return ERROR(GENERIC);
} }
/* Loop through k reusing the same context */ /* Loop through k reusing the same context */
@ -978,6 +979,7 @@ ZDICTLIB_API size_t COVER_optimizeTrainFromBuffer(void *dictBuffer,
LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to allocate parameters\n"); LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to allocate parameters\n");
COVER_best_destroy(&best); COVER_best_destroy(&best);
COVER_ctx_destroy(&ctx); COVER_ctx_destroy(&ctx);
POOL_free(pool);
return ERROR(GENERIC); return ERROR(GENERIC);
} }
data->ctx = &ctx; data->ctx = &ctx;
@ -990,6 +992,7 @@ ZDICTLIB_API size_t COVER_optimizeTrainFromBuffer(void *dictBuffer,
/* Check the parameters */ /* Check the parameters */
if (!COVER_checkParameters(data->parameters)) { if (!COVER_checkParameters(data->parameters)) {
DISPLAYLEVEL(1, "Cover parameters incorrect\n"); DISPLAYLEVEL(1, "Cover parameters incorrect\n");
free(data);
continue; continue;
} }
/* Call the function and pass ownership of data to it */ /* Call the function and pass ownership of data to it */
@ -1012,8 +1015,10 @@ ZDICTLIB_API size_t COVER_optimizeTrainFromBuffer(void *dictBuffer,
{ {
const size_t dictSize = best.dictSize; const size_t dictSize = best.dictSize;
if (ZSTD_isError(best.compressedSize)) { if (ZSTD_isError(best.compressedSize)) {
const size_t compressedSize = best.compressedSize;
COVER_best_destroy(&best); COVER_best_destroy(&best);
return best.compressedSize; POOL_free(pool);
return compressedSize;
} }
*parameters = best.parameters; *parameters = best.parameters;
memcpy(dictBuffer, best.dict, dictSize); memcpy(dictBuffer, best.dict, dictSize);