From 044e40db5a97eabfc7d67e44faa751114767ac20 Mon Sep 17 00:00:00 2001 From: Paul Cruz Date: Mon, 17 Jul 2017 11:19:23 -0700 Subject: [PATCH] removed freeCCtx() calls from createCCtx() so that it is not called twice during errors --- contrib/adaptive-compression/adapt.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/contrib/adaptive-compression/adapt.c b/contrib/adaptive-compression/adapt.c index d45bdf85..a6ba4724 100644 --- a/contrib/adaptive-compression/adapt.c +++ b/contrib/adaptive-compression/adapt.c @@ -214,7 +214,6 @@ static adaptCCtx* createCCtx(unsigned numJobs, const char* const outFilename) job->lastJob = 0; if (!job->src.start || !job->dst.start) { DISPLAY("Could not allocate buffers for jobs\n"); - freeCCtx(ctx); return NULL; } job->src.capacity = FILE_CHUNK_SIZE; @@ -231,17 +230,14 @@ static adaptCCtx* createCCtx(unsigned numJobs, const char* const outFilename) ctx->input.buffer.start = malloc(ctx->input.buffer.capacity); if (!ctx->input.buffer.start) { DISPLAY("Error: could not allocate input buffer\n"); - freeCCtx(ctx); return NULL; } if (!ctx->cctx) { DISPLAY("Error: could not allocate ZSTD_CCtx\n"); - freeCCtx(ctx); return NULL; } if (!ctx->jobs) { DISPLAY("Error: could not allocate space for jobs during context creation\n"); - freeCCtx(ctx); return NULL; } { @@ -249,7 +245,6 @@ static adaptCCtx* createCCtx(unsigned numJobs, const char* const outFilename) FILE* dstFile = stdoutUsed ? stdout : fopen(outFilename, "wb"); if (dstFile == NULL) { DISPLAY("Error: could not open output file\n"); - freeCCtx(ctx); return NULL; } ctx->dstFile = dstFile;