root/xz
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2026-10-31 03:14:56 +00:00
Code Issues Releases Wiki Activity

liblzma: Make lzma_simple_coder_init() reinit-safe after alloc failure

Browse Source 
lzma_raw_coder_init() always calls lzma_next_end() if an error occurs
in filter initialization, and no other code path can call
lzma_simple_coder_init(), so this change doesn't fix any bug.
This is just to reduce likelyhood of future bugs.
This commit is contained in:
Lasse Collin 2026-09-09 14:14:40 +03:00
parent ff834f25ae
commit c3b290c3dc
No known key found for this signature in database
GPG Key ID: 38EE757D69184620
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/liblzma/simple/simple_coder.c
View File

@ -252,6 +252,17 @@ lzma_simple_coder_init(lzma_next_coder *next, const lzma_allocator *allocator,
if (coder == NULL)
return LZMA_MEM_ERROR;
// Allocate memory for the filter-specific data structure.
if (simple_size > 0) {
coder->simple = lzma_alloc(simple_size, allocator);
if (coder->simple == NULL) {
lzma_free(coder, allocator);
return LZMA_MEM_ERROR;
}
} else {
coder->simple = NULL;
}
next->coder = coder;
next->code = &simple_code;
next->end = &simple_coder_end;
@ -260,15 +271,6 @@ lzma_simple_coder_init(lzma_next_coder *next, const lzma_allocator *allocator,
coder->next = LZMA_NEXT_CODER_INIT;
coder->filter = filter;
coder->allocated = 2 * unfiltered_max;
// Allocate memory for filter-specific data structure.
if (simple_size > 0) {
coder->simple = lzma_alloc(simple_size, allocator);
if (coder->simple == NULL)
return LZMA_MEM_ERROR;
} else {
coder->simple = NULL;
}
}
if (filters[0].options != NULL) {