ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip empty match blocks if they're found at the end as they may be created with incompressible data.

Browse source
This commit is contained in:
Con Kolivas 2019-12-03 12:22:11 +11:00
parent 93d579a1b8
commit 86661e68bf
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
stream.c
View file

@ -1635,13 +1635,21 @@ fill_another:
c_len = le64toh(c_len); c_len = le64toh(c_len);
u_len = le64toh(u_len); u_len = le64toh(u_len);
last_head = le64toh(last_head); last_head = le64toh(last_head);
print_maxverbose("Fill_buffer stream %d c_len %lld u_len %lld last_head %lld\n", streamno, c_len, u_len, last_head);
/* It is possible for there to be an empty match block at the end of
* incompressible data */
if (unlikely(c_len == 0 && u_len == 0 && streamno == 1 && last_head == 0)) {
print_maxverbose("Skipping empty match block\n");
goto skip_empty;
}
/* Check for invalid data and that the last_head is actually moving /* Check for invalid data and that the last_head is actually moving
* forward correctly. */ * forward correctly. */
if (unlikely(c_len < 1 || u_len < 1 || last_head < 0 || (last_head && last_head <= s->last_head))) { if (unlikely(c_len < 1 || u_len < 1 || last_head < 0 || (last_head && last_head <= s->last_head))) {
fatal_return(("Invalid data compressed len %lld uncompressed %lld last_head %lld\n", fatal_return(("Invalid data compressed len %lld uncompressed %lld last_head %lld\n",
c_len, u_len, last_head), -1); c_len, u_len, last_head), -1);
} }
print_maxverbose("Fill_buffer stream %d c_len %lld u_len %lld last_head %lld\n", streamno, c_len, u_len, last_head);
padded_len = MAX(c_len, MIN_SIZE); padded_len = MAX(c_len, MIN_SIZE);
sinfo->total_read += padded_len; sinfo->total_read += padded_len;
@ -1690,7 +1698,7 @@ fill_another:
if (++s->uthread_no == s->base_thread + s->total_threads) if (++s->uthread_no == s->base_thread + s->total_threads)
s->uthread_no = s->base_thread; s->uthread_no = s->base_thread;
skip_empty:
/* Reached the end of this stream, no more data to read in, otherwise /* Reached the end of this stream, no more data to read in, otherwise
* see if the next thread is free to grab more data. We also check that * see if the next thread is free to grab more data. We also check that
* we're not going to be allocating too much ram to generate all these * we're not going to be allocating too much ram to generate all these