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

Relax the memory allocation testing when no back end compression will be used.

Browse source
This commit is contained in:
Con Kolivas 2011-02-06 09:00:43 +11:00
parent 191a55d03c
commit 4efa81b1d0
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
stream.c
View file

@ -783,7 +783,7 @@ void *open_stream_out(int f, int n, i64 limit, char cbytes)
struct stream_info *sinfo;
uchar *testmalloc;
i64 testsize;
int i;
int i, testbufs;
sinfo = calloc(sizeof(struct stream_info), 1);
if (unlikely(!sinfo))
@ -795,10 +795,6 @@ void *open_stream_out(int f, int n, i64 limit, char cbytes)
sinfo->num_streams = n;
sinfo->fd = f;
/* Serious limits imposed on 32 bit capabilities */
if (BITS32)
limit = MIN(limit, two_gig / 3);
sinfo->s = calloc(sizeof(struct stream), n);
if (unlikely(!sinfo->s)) {
free(sinfo);
@ -807,9 +803,19 @@ void *open_stream_out(int f, int n, i64 limit, char cbytes)
/* Find the largest we can make the window based on ability to malloc
* ram. We need enough for the 2 streams and for the compression
* backend at most, being conservative. */
* backend at most, being conservative. We don't need any for the
* backend compression if we won't be doing any.
*/
testbufs = n;
if (!NO_COMPRESS)
testbufs++;
/* Serious limits imposed on 32 bit capabilities */
if (BITS32)
limit = MIN(limit, two_gig / testbufs);
retest_malloc:
testsize = limit * (n + 1);
testsize = limit * testbufs;
testmalloc = malloc(testsize);
if (!testmalloc) {
limit = limit / 10 * 9;