From 38261e04a3d108b3301c2339f73412e5bfb0df4b Mon Sep 17 00:00:00 2001 From: Jeremy Thien <5839661+jt416@users.noreply.github.com> Date: Thu, 31 Oct 2019 17:38:52 -0400 Subject: [PATCH 1/2] Add signature to CLA. --- docs/CLA/Jeremy-Thien.sig | Bin 0 -> 543 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/CLA/Jeremy-Thien.sig diff --git a/docs/CLA/Jeremy-Thien.sig b/docs/CLA/Jeremy-Thien.sig new file mode 100644 index 0000000000000000000000000000000000000000..16143b67fae83bec056aa8e95cb3ca46dacdffca GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-~WQ)B=N2@oh2v##1!z8H~U5B@smBC1E)67%+3RZV#P z7mlACutF3yt#j{)D+g89zxX_aYpEX`Qh~T+Q={&G-*#sX!A1cUb$baqySpg_pC&W@ zF=U)VO|wl(;5(24R#5jCKvk3lC-s>lDA zpb~}W-BvNqk(BYlUWp*UA?n&){D0MGqgqgRE2o`x!5s(vD43TDIUqoXm1Fp2-iDI;G1xaTsxX! zW)g1|RIli|9DA14B0j7_Xk Date: Thu, 31 Oct 2019 17:43:48 -0400 Subject: [PATCH 2/2] wflz: use squash malloc/free to allocate work memory https://github.com/quixdb/squash/issues/174 --- plugins/wflz/squash-wflz.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/wflz/squash-wflz.c b/plugins/wflz/squash-wflz.c index 5bcee3c..c8c4ea3 100644 --- a/plugins/wflz/squash-wflz.c +++ b/plugins/wflz/squash-wflz.c @@ -144,7 +144,7 @@ squash_wflz_compress_buffer (SquashCodec* codec, return squash_error (SQUASH_BUFFER_FULL); } - uint8_t* work_mem = (uint8_t*) malloc (wfLZ_GetWorkMemSize ()); + uint8_t* work_mem = (uint8_t*) squash_malloc (wfLZ_GetWorkMemSize ()); uint32_t wres; if (codec_name[4] == '\0') { @@ -167,14 +167,14 @@ squash_wflz_compress_buffer (SquashCodec* codec, #if SIZE_MAX < UINT32_MAX if (HEDLEY_UNLIKELY(SIZE_MAX < wres)) { - free (work_mem); + squash_free (work_mem); return squash_error (SQUASH_RANGE); } #endif *compressed_size = (size_t) wres; - free (work_mem); + squash_free (work_mem); return HEDLEY_LIKELY(*compressed_size > 0) ? SQUASH_OK : squash_error (SQUASH_FAILED); }