github-mirror/libarchive
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3132 from stoeckmann/lz4_double_free

Browse Source 
lz4: Fix double-free on reallocation failure
Alternative version of https://github.com/libarchive/libarchive/pull/2945 which removes the test (which requires a modified malloc to actually fail the 4 MB allocation).

(cherry picked from commit 1b2af5a7a8)
This commit is contained in:
Dustin L. Howett authored and Martin Matuska committed 2026-06-23 11:02:16 +02:00
1 parent b551ba7f20
commit b9cf20973f
1 file changed
+6 -2
Download Patch File Download Diff File Expand all files Collapse all files
libarchive/archive_read_support_filter_lz4.c
+6 -2
View File
@@ -327,13 +327,15 @@ lz4_allocate_out_block(struct archive_read_filter *self)
out_block_size += 64 * 1024;
if (state->out_block_size < out_block_size) {
free(state->out_block);
state->out_block = NULL;
out_block = malloc(out_block_size);
state->out_block_size = out_block_size;
if (out_block == NULL) {
state->out_block_size = 0;
archive_set_error(&self->archive->archive, ENOMEM,
"Can't allocate data for lz4 decompression");
return (ARCHIVE_FATAL);
}
state->out_block_size = out_block_size;
state->out_block = out_block;
}
if (!state->flags.block_independence)
@@ -350,13 +352,15 @@ lz4_allocate_out_block_for_legacy(struct archive_read_filter *self)
if (state->out_block_size < out_block_size) {
free(state->out_block);
state->out_block = NULL;
out_block = malloc(out_block_size);
state->out_block_size = out_block_size;
if (out_block == NULL) {
state->out_block_size = 0;
archive_set_error(&self->archive->archive, ENOMEM,
"Can't allocate data for lz4 decompression");
return (ARCHIVE_FATAL);
}
state->out_block_size = out_block_size;
state->out_block = out_block;
}
return (ARCHIVE_OK);