From 3640396b1a4fac14d62658037165d8aacf494c56 Mon Sep 17 00:00:00 2001
From: inikep <inikep@gmail.com>
Date: Fri, 3 Jun 2016 16:36:50 +0200
Subject: [PATCH] fixed: deallocation of structures in case of error in
 ZBUFF_createCCtx and ZBUFF_createDCtx

---
 lib/compress/zbuff_compress.c     | 5 +++--
 lib/compress/zstd_compress.c      | 3 ++-
 lib/decompress/zbuff_decompress.c | 5 +++--
 lib/decompress/zstd_decompress.c  | 1 +
 zlibWrapper/Makefile              | 8 ++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/compress/zbuff_compress.c b/lib/compress/zbuff_compress.c
index 0340eeb35..fe8c3801e 100644
--- a/lib/compress/zbuff_compress.c
+++ b/lib/compress/zbuff_compress.c
@@ -118,6 +118,7 @@ ZBUFF_CCtx* ZBUFF_createCCtx_advanced(ZSTD_customMem customMem)
     memset(zbc, 0, sizeof(ZBUFF_CCtx));
     memcpy(&zbc->customMem, &customMem, sizeof(ZSTD_customMem));
     zbc->zc = ZSTD_createCCtx_advanced(customMem);
+    if (zbc->zc == NULL) { ZBUFF_freeCCtx(zbc); return NULL; }
     return zbc;
 }
 
@@ -125,8 +126,8 @@ size_t ZBUFF_freeCCtx(ZBUFF_CCtx* zbc)
 {
     if (zbc==NULL) return 0;   /* support free on NULL */
     ZSTD_freeCCtx(zbc->zc);
-    zbc->customMem.customFree(zbc->customMem.opaque, zbc->inBuff);
-    zbc->customMem.customFree(zbc->customMem.opaque, zbc->outBuff);
+    if (zbc->inBuff) zbc->customMem.customFree(zbc->customMem.opaque, zbc->inBuff);
+    if (zbc->outBuff) zbc->customMem.customFree(zbc->customMem.opaque, zbc->outBuff);
     zbc->customMem.customFree(zbc->customMem.opaque, zbc);
     return 0;
 }
diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 68a6072e8..dbc9dd206 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -143,7 +143,8 @@ ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
 
 size_t ZSTD_freeCCtx(ZSTD_CCtx* cctx)
 {
-    cctx->customMem.customFree(cctx->customMem.opaque, cctx->workSpace);
+    if (cctx==NULL) return 0;   /* support free on NULL */
+    if (cctx->workSpace) cctx->customMem.customFree(cctx->customMem.opaque, cctx->workSpace);
     cctx->customMem.customFree(cctx->customMem.opaque, cctx);
     return 0;   /* reserved as a potential error code in the future */
 }
diff --git a/lib/decompress/zbuff_decompress.c b/lib/decompress/zbuff_decompress.c
index e9e84ef7c..01937bb06 100644
--- a/lib/decompress/zbuff_decompress.c
+++ b/lib/decompress/zbuff_decompress.c
@@ -106,6 +106,7 @@ ZBUFF_DCtx* ZBUFF_createDCtx_advanced(ZSTD_customMem customMem)
     memset(zbd, 0, sizeof(ZBUFF_DCtx));
     memcpy(&zbd->customMem, &customMem, sizeof(ZSTD_customMem));
     zbd->zd = ZSTD_createDCtx_advanced(customMem);
+    if (zbd->zd == NULL) { ZBUFF_freeDCtx(zbd); return NULL; }
     zbd->stage = ZBUFFds_init;
     return zbd;
 }
@@ -114,8 +115,8 @@ size_t ZBUFF_freeDCtx(ZBUFF_DCtx* zbd)
 {
     if (zbd==NULL) return 0;   /* support free on null */
     ZSTD_freeDCtx(zbd->zd);
-    zbd->customMem.customFree(zbd->customMem.opaque, zbd->inBuff);
-    zbd->customMem.customFree(zbd->customMem.opaque, zbd->outBuff);
+    if (zbd->inBuff) zbd->customMem.customFree(zbd->customMem.opaque, zbd->inBuff);
+    if (zbd->outBuff) zbd->customMem.customFree(zbd->customMem.opaque, zbd->outBuff);
     zbd->customMem.customFree(zbd->customMem.opaque, zbd);
     return 0;
 }
diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c
index 128d941eb..cb2faab79 100644
--- a/lib/decompress/zstd_decompress.c
+++ b/lib/decompress/zstd_decompress.c
@@ -172,6 +172,7 @@ ZSTD_DCtx* ZSTD_createDCtx(void)
 
 size_t ZSTD_freeDCtx(ZSTD_DCtx* dctx)
 {
+    if (dctx==NULL) return 0;   /* support free on NULL */
     dctx->customMem.customFree(dctx->customMem.opaque, dctx);
     return 0;   /* reserved as a potential error code in the future */
 }
diff --git a/zlibWrapper/Makefile b/zlibWrapper/Makefile
index 245c57d68..21d56c5e0 100644
--- a/zlibWrapper/Makefile
+++ b/zlibWrapper/Makefile
@@ -57,9 +57,5 @@ $(ZLIBWRAPPER_PATH)/zstdTurnedOn_zlibwrapper.o: $(ZLIBWRAPPER_PATH)/zstd_zlibwra
 	$(CC) $(CFLAGS) -DZWRAP_USE_ZSTD=1 -I. -c -o $@ $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.c
 
 clean:
-	-$(RM) $(ZLIBWRAPPER_PATH)/*.o
-	-$(RM) $(EXAMPLE_PATH)/*.o
-	-$(RM) *.o
-	-$(RM) *.exe
-	-$(RM) foo.gz
-
+	-$(RM) $(ZLIBWRAPPER_PATH)/*.o $(EXAMPLE_PATH)/*.o *.o *.exe foo.gz example example_d example_zstd
+	@echo Cleaning completed