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 assignment to deallocated buffer in failed decompression.

Browse source
This commit is contained in:
Con Kolivas 2018-05-16 14:16:49 +10:00
parent d212cc1115
commit 1971c00950
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
stream.c
View file

@ -456,9 +456,8 @@ static int zpaq_decompress_buf(rzip_control *control __UNUSED__, struct uncomp_t
if (unlikely(dlen != ucthread->u_len)) { if (unlikely(dlen != ucthread->u_len)) {
print_err("Inconsistent length after decompression. Got %ld bytes, expected %lld\n", dlen, ucthread->u_len); print_err("Inconsistent length after decompression. Got %ld bytes, expected %lld\n", dlen, ucthread->u_len);
ret = -1; ret = -1;
} } else
dealloc(c_buf);
dealloc(c_buf);
out: out:
if (ret == -1) if (ret == -1)
ucthread->s_buf = c_buf; ucthread->s_buf = c_buf;
@ -491,9 +490,8 @@ static int bzip2_decompress_buf(rzip_control *control __UNUSED__, struct uncomp_
if (unlikely(dlen != ucthread->u_len)) { if (unlikely(dlen != ucthread->u_len)) {
print_err("Inconsistent length after decompression. Got %d bytes, expected %lld\n", dlen, ucthread->u_len); print_err("Inconsistent length after decompression. Got %d bytes, expected %lld\n", dlen, ucthread->u_len);
ret = -1; ret = -1;
} } else
dealloc(c_buf);
dealloc(c_buf);
out: out:
if (ret == -1) if (ret == -1)
ucthread->s_buf = c_buf; ucthread->s_buf = c_buf;
@ -526,9 +524,8 @@ static int gzip_decompress_buf(rzip_control *control __UNUSED__, struct uncomp_t
if (unlikely((i64)dlen != ucthread->u_len)) { if (unlikely((i64)dlen != ucthread->u_len)) {
print_err("Inconsistent length after decompression. Got %ld bytes, expected %lld\n", dlen, ucthread->u_len); print_err("Inconsistent length after decompression. Got %ld bytes, expected %lld\n", dlen, ucthread->u_len);
ret = -1; ret = -1;
} } else
dealloc(c_buf);
dealloc(c_buf);
out: out:
if (ret == -1) if (ret == -1)
ucthread->s_buf = c_buf; ucthread->s_buf = c_buf;
@ -564,9 +561,8 @@ static int lzma_decompress_buf(rzip_control *control, struct uncomp_thread *ucth
if (unlikely((i64)dlen != ucthread->u_len)) { if (unlikely((i64)dlen != ucthread->u_len)) {
print_err("Inconsistent length after decompression. Got %lld bytes, expected %lld\n", (i64)dlen, ucthread->u_len); print_err("Inconsistent length after decompression. Got %lld bytes, expected %lld\n", (i64)dlen, ucthread->u_len);
ret = -1; ret = -1;
} } else
dealloc(c_buf);
dealloc(c_buf);
out: out:
if (ret == -1) if (ret == -1)
ucthread->s_buf = c_buf; ucthread->s_buf = c_buf;
@ -599,9 +595,8 @@ static int lzo_decompress_buf(rzip_control *control __UNUSED__, struct uncomp_th
if (unlikely((i64)dlen != ucthread->u_len)) { if (unlikely((i64)dlen != ucthread->u_len)) {
print_err("Inconsistent length after decompression. Got %lu bytes, expected %lld\n", (unsigned long)dlen, ucthread->u_len); print_err("Inconsistent length after decompression. Got %lu bytes, expected %lld\n", (unsigned long)dlen, ucthread->u_len);
ret = -1; ret = -1;
} } else
dealloc(c_buf);
dealloc(c_buf);
out: out:
if (ret == -1) if (ret == -1)
ucthread->s_buf = c_buf; ucthread->s_buf = c_buf;