ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2026-04-05 06:15:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Deallocate runzip structures after all runzip chunks are complete to avoid a race in the case of a failed chunk decompressing.

Browse source
This commit is contained in:
Con Kolivas 2021-02-15 15:20:12 +11:00
parent 2c7c4832b3
commit be884d09e0
3 changed files with 48 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
stream.c
View file

@ -1085,6 +1085,8 @@ void *open_stream_in(rzip_control *control, int f, int n, char chunk_bytes)
sinfo->s = calloc(sizeof(struct stream), n);
if (unlikely(!sinfo->s)) {
dealloc(sinfo);
dealloc(threads);
dealloc(ucthreads);
return NULL;
}
@ -1206,6 +1208,8 @@ again:
failed:
dealloc(sinfo->s);
dealloc(sinfo);
dealloc(threads);
dealloc(ucthreads);
return NULL;
}
@ -1818,6 +1822,20 @@ int close_stream_out(rzip_control *control, void *ss)
return 0;
}
/* Add to an runzip list to safely deallocate memory after all threads have
* returned. */
static void add_to_rulist(rzip_control *control, struct stream_info *sinfo)
{
struct runzip_node *node = calloc(sizeof(struct runzip_node), 1);
if (unlikely(!node))
failure("Failed to calloc struct node in add_rulist\n");
node->sinfo = sinfo;
node->pthreads = control->pthreads;
node->prev = control->rulist;
control->ruhead = node;
}
/* close down an input stream */
int close_stream_in(rzip_control *control, void *ss)
{
@ -1834,10 +1852,9 @@ int close_stream_in(rzip_control *control, void *ss)
dealloc(sinfo->s[i].buf);
output_thread = 0;
dealloc(sinfo->ucthreads);
dealloc(control->pthreads);
dealloc(sinfo->s);
dealloc(sinfo);
/* We cannot safely release the sinfo and pthread data here till all
* threads are shut down. */
add_to_rulist(control, sinfo);
return 0;
}