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

Make the tmp out buf slightly larger to account for incompressible data, and check for buffer overflows.

Browse source
This commit is contained in:
Con Kolivas 2011-03-13 08:16:46 +11:00
parent 11ea12d3ce
commit 2f87f62696
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lrzip.c
View file

@ -734,9 +734,13 @@ next_chunk:
free(infilecopy);
}
/* To perform STDOUT, we allocate a proportion of ram that is then used as
* a pseudo-temporary file */
static void open_tmpoutbuf(rzip_control *control)
{
control->tmp_outbuf = malloc(control->maxram);
control->out_maxlen = control->maxram + control->page_size;
control->tmp_outbuf = malloc(control->out_maxlen);
if (unlikely(!control->tmp_outbuf))
fatal("Failed to malloc tmp_outbuf in open_tmpoutbuf\n");
control->out_ofs = control->out_len = MAGIC_LEN;

3
lrzip_private.h
View file

@ -162,7 +162,8 @@ struct rzip_control {
char *tmp_outbuf; // Temporary file storage for stdout
i64 out_ofs; // Output offset when tmp_outbuf in use
i64 out_len; // Total length of tmp_outbuf
i64 rel_ofs; // Relative offset when stdou has been flushed
i64 out_maxlen; // The largest the tmp_outbuf can be used
i64 rel_ofs; // Relative tmp_outbuf offset when stdout has been flushed
FILE *msgout; //stream for output messages
const char *suffix;
int compression_level;

3
stream.c
View file

@ -639,6 +639,9 @@ ssize_t put_fdout(rzip_control *control, int fd, void *offset_buf, ssize_t ret)
{
if (!STDOUT || DECOMPRESS || TEST_ONLY)
return write(fd, offset_buf, (size_t)ret);
if (unlikely(control->out_ofs + ret > control->out_maxlen))
failure("Tried to write beyond temporary output buffer. Need a larger out_maxlen\n");
memcpy(control->tmp_outbuf + control->out_ofs, offset_buf, ret);
control->out_ofs += ret;
if (likely(control->out_ofs > control->out_len))