Skip to content

Clean-up nif_zlib_compress_1 to reduce gcc confusion #2002

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

Merged
merged 1 commit into from
Nov 25, 2025
Merged

Clean-up nif_zlib_compress_1 to reduce gcc confusion #2002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 10 additions & 19 deletions src/libAtomVM/nifs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6344,9 +6344,6 @@ static term nif_zlib_compress_1(Context *ctx, int argc, term argv[])
{
UNUSED(argc)

term error = OK_ATOM;

Bytef *output_buf = NULL;
char *input_buf = NULL;
size_t input_size = 0;
char *alloc_ptr = NULL;
Expand All @@ -6355,8 +6352,7 @@ static term nif_zlib_compress_1(Context *ctx, int argc, term argv[])
if (LIKELY(term_is_list(input))) {
term status = iolist_to_buffer(input, &input_buf, &input_size);
if (UNLIKELY(status != OK_ATOM)) {
error = status;
goto cleanup;
RAISE_ERROR(status);
}

bool allocated = input_size > 0;
Expand All @@ -6370,39 +6366,34 @@ static term nif_zlib_compress_1(Context *ctx, int argc, term argv[])
input_buf = (char *) term_binary_data(input);
input_size = term_binary_size(input);
} else {
error = BADARG_ATOM;
goto cleanup;
RAISE_ERROR(BADARG_ATOM);
}

// to_allocate is an upper bound for compression size
// changes to actual size after calling compress
uLong to_allocate = compressBound(input_size);
// TODO: use `to_allocate` binary directly instead of allocating a buffer
// Currently not possible, there's no way to shrink backing buffer for the binary
output_buf = malloc(to_allocate);
Bytef *output_buf = malloc(to_allocate);
if (IS_NULL_PTR(output_buf)) {
error = OUT_OF_MEMORY_ATOM;
goto cleanup;
free(alloc_ptr);
RAISE_ERROR(OUT_OF_MEMORY_ATOM);
}

int z_ret = compress(output_buf, &to_allocate, (const Bytef *) input_buf, input_size);
free(alloc_ptr);
if (UNLIKELY(z_ret != Z_OK)) {
error = OUT_OF_MEMORY_ATOM;
goto cleanup;
free(output_buf);
RAISE_ERROR(OUT_OF_MEMORY_ATOM);
}

if (UNLIKELY(memory_ensure_free(ctx, term_binary_data_size_in_terms(to_allocate)) != MEMORY_GC_OK)) {
error = OUT_OF_MEMORY_ATOM;
goto cleanup;
free(output_buf);
RAISE_ERROR(OUT_OF_MEMORY_ATOM);
}
term bin_res = term_from_literal_binary(output_buf, to_allocate, &ctx->heap, ctx->global);

cleanup:
free(alloc_ptr);
free(output_buf);
if (UNLIKELY(error != OK_ATOM)) {
RAISE_ERROR(error);
}
return bin_res;
}
#endif
Expand Down
Loading