dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

30 bytes or so gone from zlib, also made stored blocks use 2 bytes less each

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1254 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
justin1014 2002-10-01 17:36:25 +00:00
parent 2c96636160
commit e1985f4f1c
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/zlib/INFBLOCK.C
View file

@ -111,14 +111,7 @@ int r=Z_OK;
} }
break; break;
case LENS: case LENS:
NEEDBITS(32) NEEDBITS(16)
if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
{
s->mode = BAD;
// z->msg = (char*)"err";//invalid stored block lengths";
r = Z_DATA_ERROR;
LEAVE
}
s->sub.left = (uInt)b & 0xffff; s->sub.left = (uInt)b & 0xffff;
b = k = 0; /* dump bits */ b = k = 0; /* dump bits */
Tracev((stderr, "inflate: stored length %u\n", s->sub.left)); Tracev((stderr, "inflate: stored length %u\n", s->sub.left));
@ -144,15 +137,12 @@ int r=Z_OK;
case TABLE: case TABLE:
NEEDBITS(14) NEEDBITS(14)
s->sub.trees.table = t = (uInt)b & 0x3fff; s->sub.trees.table = t = (uInt)b & 0x3fff;
#ifndef PKZIP_BUG_WORKAROUND
if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29) if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
{ {
s->mode = BAD; s->mode = BAD;
// z->msg = (char*)"err";//too many length or distance symbols";
r = Z_DATA_ERROR; r = Z_DATA_ERROR;
LEAVE LEAVE
} }
#endif
t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f); t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL) if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
{ {
@ -216,7 +206,7 @@ int r=Z_OK;
if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) || if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
(c == 16 && i < 1)) (c == 16 && i < 1))
{ {
ZFREE(z, s->sub.trees.blens); // ZFREE(z, s->sub.trees.blens);
s->mode = BAD; s->mode = BAD;
// z->msg = (char*)"err";//invalid bit length repeat"; // z->msg = (char*)"err";//invalid bit length repeat";
r = Z_DATA_ERROR; r = Z_DATA_ERROR;

1
Source/zlib/trees.c
View file

@ -869,7 +869,6 @@ local void copy_block(s, buf, len, header)
if (header) { if (header) {
put_short(s, (ush)len); put_short(s, (ush)len);
put_short(s, (ush)~len);
#ifdef DEBUG #ifdef DEBUG
s->bits_sent += 2*16; s->bits_sent += 2*16;
#endif #endif