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

Fix & optimization for unzip_match

Browse source 
read_fdhist() cannot be called after write_1g() is called, in case that write() caused a switch to !TMP_OUTBUF, moving the read pointer.
read_fdhist() should only be called immediately after seekto_fdhist()

In this case, only one call to read_fdhist() was enough, before the loop, as subsuequent calls only gave repeats of the same data.
This commit is contained in:
Oded Shimon 2021-07-11 11:20:04 +03:00
parent 465afe830f
commit acaa8374d0
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
runzip.c
View file

@ -194,7 +194,7 @@ static i64 read_fdhist(rzip_control *control, void *buf, i64 len)
static i64 unzip_match(rzip_control *control, void *ss, i64 len, uint32 *cksum, int chunk_bytes) static i64 unzip_match(rzip_control *control, void *ss, i64 len, uint32 *cksum, int chunk_bytes)
{ {
i64 offset, n, total, cur_pos; i64 offset, n, total, cur_pos;
uchar *buf, *off_buf; uchar *buf;
if (unlikely(len < 0)) if (unlikely(len < 0))
failure_return(("len %lld is negative in unzip_match!\n",len), -1); failure_return(("len %lld is negative in unzip_match!\n",len), -1);
@ -212,32 +212,35 @@ static i64 unzip_match(rzip_control *control, void *ss, i64 len, uint32 *cksum,
fatal_return(("Seek failed by %d from %d on history file in unzip_match\n", fatal_return(("Seek failed by %d from %d on history file in unzip_match\n",
offset, cur_pos), -1); offset, cur_pos), -1);
buf = (uchar *)malloc(len); n = MIN(len, offset);
if (unlikely(n < 1))
fatal_return(("Failed fd history in unzip_match due to corrupt archive\n"), -1);
buf = (uchar *)malloc(n);
if (unlikely(!buf)) if (unlikely(!buf))
fatal_return(("Failed to malloc match buffer of size %lld\n", len), -1); fatal_return(("Failed to malloc match buffer of size %lld\n", len), -1);
off_buf = buf;
if (unlikely(read_fdhist(control, buf, (size_t)n) != (ssize_t)n)) {
dealloc(buf);
fatal_return(("Failed to read %d bytes in unzip_match\n", n), -1);
}
while (len) { while (len) {
n = MIN(len, offset); n = MIN(len, offset);
if (unlikely(n < 1)) if (unlikely(n < 1))
fatal_return(("Failed fd history in unzip_match due to corrupt archive\n"), -1); fatal_return(("Failed fd history in unzip_match due to corrupt archive\n"), -1);
if (unlikely(read_fdhist(control, off_buf, (size_t)n) != (ssize_t)n)) { if (unlikely(write_1g(control, buf, (size_t)n) != (ssize_t)n)) {
dealloc(buf);
fatal_return(("Failed to read %d bytes in unzip_match\n", n), -1);
}
if (unlikely(write_1g(control, off_buf, (size_t)n) != (ssize_t)n)) {
dealloc(buf); dealloc(buf);
fatal_return(("Failed to write %d bytes in unzip_match\n", n), -1); fatal_return(("Failed to write %d bytes in unzip_match\n", n), -1);
} }
if (!HAS_MD5) if (!HAS_MD5)
*cksum = CrcUpdate(*cksum, off_buf, n); *cksum = CrcUpdate(*cksum, buf, n);
if (!NO_MD5) if (!NO_MD5)
md5_process_bytes(off_buf, n, &control->ctx); md5_process_bytes(buf, n, &control->ctx);
len -= n; len -= n;
off_buf += n;
total += n; total += n;
} }