From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Tue, 21 Feb 2017 17:59:56 +0000 (+0100)
Subject: zstd_compress.c: fix memory leaks
X-Git-Tag: v1.1.4~1^2~52^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8114e5802edfb236758d7a4d7ce24795e74afa2;p=thirdparty%2Fzstd.git

zstd_compress.c: fix memory leaks
---

diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile
index 10a133dd7..21ef935c6 100644
--- a/contrib/pzstd/Makefile
+++ b/contrib/pzstd/Makefile
@@ -86,20 +86,20 @@ endif
 default: all
 
 .PHONY: test-pzstd
-test-pzstd: TESTFLAGS='--gtest_filter=-*ExtremelyLarge*'
+test-pzstd: TESTFLAGS=--gtest_filter=-*ExtremelyLarge*
 test-pzstd: clean googletest pzstd tests check
 
 .PHONY: test-pzstd32
 test-pzstd32: clean googletest32 all32 check
 
 .PHONY: test-pzstd-tsan
-test-pzstd-tsan: LDFLAGS="-fuse-ld=gold"
-test-pzstd-tsan: TESTFLAGS='--gtest_filter=-*ExtremelyLarge*'
+test-pzstd-tsan: LDFLAGS=-fuse-ld=gold
+test-pzstd-tsan: TESTFLAGS=--gtest_filter=-*ExtremelyLarge*
 test-pzstd-tsan: clean googletest tsan check
 
 .PHONY: test-pzstd-asan
-test-pzstd-asan: LDFLAGS="-fuse-ld=gold"
-test-pzstd-asan: TESTFLAGS='--gtest_filter=-*ExtremelyLarge*'
+test-pzstd-asan: LDFLAGS=-fuse-ld=gold
+test-pzstd-asan: TESTFLAGS=--gtest_filter=-*ExtremelyLarge*
 test-pzstd-asan: clean asan check
 
 .PHONY: check
diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 924189b0c..0e0f9d373 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -2786,7 +2786,7 @@ ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize, u
 
         if (!cdict || !cctx) {
             ZSTD_free(cdict, customMem);
-            ZSTD_free(cctx, customMem);
+            ZSTD_freeCCtx(cctx);
             return NULL;
         }
 
@@ -2804,8 +2804,8 @@ ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize, u
         {   size_t const errorCode = ZSTD_compressBegin_advanced(cctx, cdict->dictContent, dictSize, params, 0);
             if (ZSTD_isError(errorCode)) {
                 ZSTD_free(cdict->dictBuffer, customMem);
-                ZSTD_free(cctx, customMem);
                 ZSTD_free(cdict, customMem);
+                ZSTD_freeCCtx(cctx);
                 return NULL;
         }   }