Skip to content

Feature wflz allocation #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jt416 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature wflz allocation #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38261e0
Add signature to CLA.
jt416 Oct 31, 2019
9aaba11
wflz: use squash malloc/free to allocate work memory
jt416 Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added docs/CLA/Jeremy-Thien.sig
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions plugins/wflz/squash-wflz.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand All @@ -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);
}
Expand Down