d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sanity-check the block size.

Browse Source 
Thanks to: Joerg Sonnenberger
MFC after: 7 days
This commit is contained in:
Tim Kientzle 2008-02-21 03:21:50 +00:00
parent 043ec583dc
commit 5b7a04161d
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/libarchive/archive_write_set_compression_gzip.c
View File

@ -106,6 +106,21 @@ archive_compressor_gzip_init(struct archive_write *a)
return (ret);
}
/*
* The next check is a temporary workaround until the gzip
* code can be overhauled some. The code should not require
* that compressed_buffer_size == bytes_per_block. Removing
* this assumption will allow us to compress larger chunks at
* a time, which should improve overall performance
* marginally. As a minor side-effect, such a cleanup would
* allow us to support truly arbitrary block sizes.
*/
if (a->bytes_per_block < 10) {
archive_set_error(&a->archive, EINVAL,
"GZip compressor requires a minimum 10 byte block size");
return (ARCHIVE_FATAL);
}
state = (struct private_data *)malloc(sizeof(*state));
if (state == NULL) {
archive_set_error(&a->archive, ENOMEM,
@ -114,6 +129,10 @@ archive_compressor_gzip_init(struct archive_write *a)
}
memset(state, 0, sizeof(*state));
/*
* See comment above. We should set compressed_buffer_size to
* max(bytes_per_block, 65536), but the code can't handle that yet.
*/
state->compressed_buffer_size = a->bytes_per_block;
state->compressed = (unsigned char *)malloc(state->compressed_buffer_size);
state->crc = crc32(0L, NULL, 0);