Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 302670: add an extra dummy byte at the end to support zlib 1.1.4.

Browse Source 
r=nelson.


git-svn-id: svn://10.0.0.236/trunk@254071 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com
2008-09-05 23:14:24 +00:00
parent 0c3d1e0d5c
commit 5840ee8a1f
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/security/nss/lib/jar/jarfile.c
View File

@@ -360,7 +360,8 @@ static int jar_physical_inflate
unsigned long prev_total, ochunk, tin;
if ((inbuf = (char *) PORT_ZAlloc (ICHUNK)) == NULL)
/* Raw inflate in zlib 1.1.4 needs an extra dummy byte at the end */
if ((inbuf = (char *) PORT_ZAlloc (ICHUNK + 1)) == NULL)
return JAR_ERR_MEMORY;
if ((outbuf = (char *) PORT_ZAlloc (OCHUNK)) == NULL)
@@ -400,6 +401,12 @@ static int jar_physical_inflate
at += chunk;
if (at == length)
{
/* add an extra dummy byte at the end */
inbuf[chunk++] = 0xDD;
}
zs.next_in = (Bytef *) inbuf;
zs.avail_in = chunk;
zs.avail_out = OCHUNK;
@@ -676,17 +683,16 @@ static int jar_extract_mf (JAR *jar, jarArch format, JAR_FILE fp, char *ext)
continue;
}
if (phy->length == 0)
if (phy->length == 0 || phy->length > 0xFFFF)
{
/* manifest files cannot be zero length! */
/* manifest files cannot be zero length or too big! */
/* the 0xFFFF limit is per J2SE SDK */
return JAR_ERR_CORRUPT;
}
/* Read in the manifest and parse it */
/* limit is per J2SE SDK */
if (phy->length <= 0xFFFF) {
manifest = (char ZHUGEP *) PORT_ZAlloc (phy->length + 1);
}
/* Raw inflate in zlib 1.1.4 needs an extra dummy byte at the end */
manifest = (char ZHUGEP *) PORT_ZAlloc (phy->length + 1);
if (manifest)
{
JAR_FSEEK (fp, phy->offset, (PRSeekWhence)0);
@@ -702,6 +708,8 @@ static int jar_extract_mf (JAR *jar, jarArch format, JAR_FILE fp, char *ext)
if (phy->compression == 8)
{
length = phy->length;
/* add an extra dummy byte at the end */
manifest[length++] = 0xDD;
status = jar_inflate_memory ((unsigned int) phy->compression, &length, phy->uncompressed_length, &manifest);