mirror of
https://github.com/zlib-ng/minizip-ng
synced 2025-03-28 21:13:18 +00:00
implement i/o improvements when searching for the central directory (http://mail.madler.net/pipermail/zlib-devel_madler.net/2012-February/002760.html)
This commit is contained in:
Nathan Moinvaziri
parent
76d6131670
commit
a39d6dfa81
218
unzip.c
218
unzip.c
@ -442,7 +442,6 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
|
||||
return 0;
|
||||
|
||||
|
||||
uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
|
||||
|
||||
if (uMaxBack>uSizeFile)
|
||||
@ -487,6 +486,7 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
|
||||
return uPosFound;
|
||||
}
|
||||
|
||||
#define SIZECENTRALHEADERLOCATOR (0x14) /* 20 */
|
||||
|
||||
/*
|
||||
Locate the Central directory 64 of a zipfile (at the end, just before
|
||||
@ -494,74 +494,36 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
|
||||
*/
|
||||
local ZPOS64_T unz64local_SearchCentralDir64 OF((
|
||||
const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
||||
voidpf filestream));
|
||||
voidpf filestream,
|
||||
const ZPOS64_T endcentraloffset));
|
||||
|
||||
local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
||||
voidpf filestream)
|
||||
voidpf filestream,
|
||||
const ZPOS64_T endcentraloffset)
|
||||
{
|
||||
unsigned char* buf;
|
||||
ZPOS64_T uSizeFile;
|
||||
ZPOS64_T uBackRead;
|
||||
ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
|
||||
ZPOS64_T uPosFound=0;
|
||||
uLong uL;
|
||||
ZPOS64_T relativeOffset;
|
||||
ZPOS64_T uPosFound;
|
||||
uLong uL;
|
||||
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
|
||||
return 0;
|
||||
|
||||
/* Given location of end of central offset record we can */
|
||||
relativeOffset = endcentraloffset + SIZECENTRALHEADERLOCATOR;
|
||||
uPosFound = ZTELL64(*pzlib_filefunc_def,filestream) - relativeOffset;
|
||||
|
||||
uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
|
||||
|
||||
if (uMaxBack>uSizeFile)
|
||||
uMaxBack = uSizeFile;
|
||||
|
||||
buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
|
||||
if (buf==NULL)
|
||||
return 0;
|
||||
|
||||
uBackRead = 4;
|
||||
while (uBackRead<uMaxBack)
|
||||
{
|
||||
uLong uReadSize;
|
||||
ZPOS64_T uReadPos;
|
||||
int i;
|
||||
if (uBackRead+BUFREADCOMMENT>uMaxBack)
|
||||
uBackRead = uMaxBack;
|
||||
else
|
||||
uBackRead+=BUFREADCOMMENT;
|
||||
uReadPos = uSizeFile-uBackRead ;
|
||||
|
||||
uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
|
||||
(BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
break;
|
||||
|
||||
if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
|
||||
break;
|
||||
|
||||
for (i=(int)uReadSize-3; (i--)>0;)
|
||||
if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
|
||||
((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
|
||||
{
|
||||
uPosFound = uReadPos+i;
|
||||
break;
|
||||
}
|
||||
|
||||
if (uPosFound!=0)
|
||||
break;
|
||||
}
|
||||
TRYFREE(buf);
|
||||
if (uPosFound == 0)
|
||||
if (uPosFound <= 0)
|
||||
return 0;
|
||||
|
||||
/* Zip64 end of central directory locator */
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
return 0;
|
||||
|
||||
/* the signature, already checked */
|
||||
/* read locator signature */
|
||||
if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
|
||||
return 0;
|
||||
if (uL != 0x07064b50)
|
||||
return 0;
|
||||
|
||||
/* number of the disk with the start of the zip64 end of central directory */
|
||||
if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
|
||||
@ -634,92 +596,36 @@ local unzFile unzOpenInternal (const void *path,
|
||||
return NULL;
|
||||
|
||||
us.filestream_with_CD = us.filestream;
|
||||
central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
|
||||
us.isZip64 = 0;
|
||||
|
||||
/* Use unz64local_SearchCentralDir first. Only based on the result
|
||||
is it necessary to locate the unz64local_SearchCentralDir64 */
|
||||
central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
|
||||
if (central_pos)
|
||||
{
|
||||
uLong uS;
|
||||
ZPOS64_T uL64;
|
||||
|
||||
us.isZip64 = 1;
|
||||
|
||||
if (ZSEEK64(us.z_filefunc, us.filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
if (ZSEEK64(us.z_filefunc, us.filestream,central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* the signature, already checked */
|
||||
if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* size of zip64 end of central directory record */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* version made by */
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* version needed to extract */
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* number of this disk */
|
||||
if (unz64local_getLong(&us.z_filefunc, us.filestream,&us.number_disk)!=UNZ_OK)
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
us.number_disk = uL;
|
||||
|
||||
/* number of the disk with the start of the central directory */
|
||||
if (unz64local_getLong(&us.z_filefunc, us.filestream,&us.gi.number_disk_with_CD)!=UNZ_OK)
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
us.gi.number_disk_with_CD = uL;
|
||||
|
||||
/* total number of entries in the central directory on this disk */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* total number of entries in the central directory */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
if (number_entry_CD!=us.gi.number_entry)
|
||||
err=UNZ_BADZIPFILE;
|
||||
|
||||
/* size of the central directory */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* offset of start of central directory with respect to the
|
||||
starting disk number */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
us.gi.size_comment = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
|
||||
if (central_pos==0)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
us.isZip64 = 0;
|
||||
|
||||
if (ZSEEK64(us.z_filefunc, us.filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* the signature, already checked */
|
||||
if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* number of this disk */
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.number_disk)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* number of the disk with the start of the central directory */
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.number_disk_with_CD)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* total number of entries in the central dir on this disk */
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
us.gi.number_entry = uL;
|
||||
|
||||
/* total number of entries in the central dir */
|
||||
/* total number of entries in the central directory */
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
number_entry_CD = uL;
|
||||
@ -741,7 +647,70 @@ local unzFile unzOpenInternal (const void *path,
|
||||
/* zipfile comment length */
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
if ((err==UNZ_OK) && ((us.size_central_dir==0xffff) || (us.offset_central_dir==0xffffffff)))
|
||||
{
|
||||
/* Format should be Zip64, as the central directory or file size is too large */
|
||||
central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream,central_pos);
|
||||
if (central_pos)
|
||||
{
|
||||
ZPOS64_T uL64;
|
||||
|
||||
us.isZip64 = 1;
|
||||
|
||||
if (ZSEEK64(us.z_filefunc, us.filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* the signature, already checked */
|
||||
if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* size of zip64 end of central directory record */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* version made by */
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* version needed to extract */
|
||||
if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* number of this disk */
|
||||
if (unz64local_getLong(&us.z_filefunc, us.filestream,&us.number_disk)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* number of the disk with the start of the central directory */
|
||||
if (unz64local_getLong(&us.z_filefunc, us.filestream,&us.gi.number_disk_with_CD)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* total number of entries in the central directory on this disk */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* total number of entries in the central directory */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
if (number_entry_CD!=us.gi.number_entry)
|
||||
err=UNZ_BADZIPFILE;
|
||||
|
||||
/* size of the central directory */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
/* offset of start of central directory with respect to the
|
||||
starting disk number */
|
||||
if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
|
||||
err=UNZ_ERRNO;
|
||||
}
|
||||
else
|
||||
err=UNZ_BADZIPFILE;
|
||||
}
|
||||
}
|
||||
else
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
|
||||
(err==UNZ_OK))
|
||||
@ -761,7 +730,7 @@ local unzFile unzOpenInternal (const void *path,
|
||||
|
||||
|
||||
s = (unz64_s*)ALLOC(sizeof(unz64_s));
|
||||
if ( s != NULL)
|
||||
if (s != NULL)
|
||||
{
|
||||
*s=us;
|
||||
unzGoToFirstFile((unzFile)s);
|
||||
@ -918,7 +887,6 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
|
||||
if (ZSEEK64(s->z_filefunc, s->filestream_with_CD, s->pos_in_central_dir+s->byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
err=UNZ_ERRNO;
|
||||
|
||||
|
||||
/* we check the magic */
|
||||
if (err==UNZ_OK)
|
||||
{
|
||||
@ -1621,10 +1589,10 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
|
||||
pfile_in_zip_read_info->raw=raw;
|
||||
|
||||
if (pfile_in_zip_read_info->read_buffer==NULL)
|
||||
{
|
||||
{
|
||||
TRYFREE(pfile_in_zip_read_info);
|
||||
return UNZ_INTERNALERROR;
|
||||
}
|
||||
}
|
||||
|
||||
pfile_in_zip_read_info->stream_initialised=0;
|
||||
|
||||
@ -1709,10 +1677,10 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
|
||||
if (err == Z_OK)
|
||||
pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
|
||||
else
|
||||
{
|
||||
{
|
||||
TRYFREE(pfile_in_zip_read_info);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
/* windowBits is passed < 0 to tell that there is no zlib header.
|
||||
* Note that in this case inflate *requires* an extra "dummy" byte
|
||||
* after the compressed stream in order to complete decompression and
|
||||
|
||||
394
zip.c
394
zip.c
@ -600,127 +600,135 @@ local int zipGoToNextDisk(zipFile file)
|
||||
return err;
|
||||
}
|
||||
|
||||
local ZPOS64_T zip64local_SearchCentralDirInternal(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int magicCode)
|
||||
{
|
||||
unsigned char* buf;
|
||||
ZPOS64_T uSizeFile;
|
||||
ZPOS64_T uBackRead;
|
||||
ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
|
||||
ZPOS64_T uPosFound=0;
|
||||
|
||||
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
|
||||
return 0;
|
||||
|
||||
uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
|
||||
|
||||
if (uMaxBack>uSizeFile)
|
||||
uMaxBack = uSizeFile;
|
||||
|
||||
buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
|
||||
if (buf==NULL)
|
||||
return 0;
|
||||
|
||||
uBackRead = 4;
|
||||
while (uBackRead<uMaxBack)
|
||||
{
|
||||
uLong uReadSize;
|
||||
ZPOS64_T uReadPos;
|
||||
int i;
|
||||
if (uBackRead+BUFREADCOMMENT>uMaxBack)
|
||||
uBackRead = uMaxBack;
|
||||
else
|
||||
uBackRead+=BUFREADCOMMENT;
|
||||
uReadPos = uSizeFile-uBackRead ;
|
||||
|
||||
uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
|
||||
(BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
break;
|
||||
|
||||
if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
|
||||
break;
|
||||
|
||||
for (i=(int)uReadSize-3; (i--)>0;)
|
||||
if ((*(buf+i))==(magicCode >> 24 & 0xff) &&
|
||||
(*(buf+i+1))==(magicCode >> 16 & 0xff) &&
|
||||
(*(buf+i+2))==(magicCode >> 8 & 0xff) &&
|
||||
(*(buf+i+3))==(magicCode & 0xff))
|
||||
{
|
||||
uPosFound = uReadPos+i;
|
||||
break;
|
||||
}
|
||||
|
||||
if (uPosFound!=0)
|
||||
break;
|
||||
}
|
||||
TRYFREE(buf);
|
||||
return uPosFound;
|
||||
}
|
||||
|
||||
/*
|
||||
Locate the Central directory of a zipfile (at the end, just before
|
||||
the global comment)
|
||||
*/
|
||||
local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
|
||||
|
||||
local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
|
||||
{
|
||||
return zip64local_SearchCentralDirInternal(pzlib_filefunc_def, filestream, 0x504b0506);
|
||||
}
|
||||
|
||||
/*
|
||||
Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
|
||||
the global comment)
|
||||
*/
|
||||
local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
|
||||
|
||||
local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
|
||||
{
|
||||
ZPOS64_T uPosFound=0;
|
||||
uLong uL;
|
||||
ZPOS64_T relativeOffset;
|
||||
|
||||
uPosFound = zip64local_SearchCentralDirInternal(pzlib_filefunc_def, filestream, 0x504b0607);
|
||||
if (uPosFound == 0)
|
||||
return 0;
|
||||
|
||||
/* Zip64 end of central directory locator */
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
return 0;
|
||||
|
||||
/* the signature, already checked */
|
||||
if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
|
||||
return 0;
|
||||
|
||||
/* number of the disk with the start of the zip64 end of central directory */
|
||||
if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
|
||||
return 0;
|
||||
if (uL != 0)
|
||||
return 0;
|
||||
|
||||
/* relative offset of the zip64 end of central directory record */
|
||||
if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
|
||||
return 0;
|
||||
|
||||
/* total number of disks */
|
||||
if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
|
||||
return 0;
|
||||
if (uL != 1)
|
||||
return 0;
|
||||
|
||||
/* Goto Zip64 end of central directory record */
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
return 0;
|
||||
|
||||
/* the signature */
|
||||
if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
|
||||
return 0;
|
||||
|
||||
if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
|
||||
return 0;
|
||||
|
||||
return relativeOffset;
|
||||
local ZPOS64_T zip64local_SearchCentralDirInternal(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int magicCode)
|
||||
{
|
||||
unsigned char* buf;
|
||||
ZPOS64_T uSizeFile;
|
||||
ZPOS64_T uBackRead;
|
||||
ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
|
||||
ZPOS64_T uPosFound=0;
|
||||
|
||||
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
|
||||
return 0;
|
||||
|
||||
uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
|
||||
|
||||
if (uMaxBack>uSizeFile)
|
||||
uMaxBack = uSizeFile;
|
||||
|
||||
buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
|
||||
if (buf==NULL)
|
||||
return 0;
|
||||
|
||||
uBackRead = 4;
|
||||
while (uBackRead<uMaxBack)
|
||||
{
|
||||
uLong uReadSize;
|
||||
ZPOS64_T uReadPos;
|
||||
int i;
|
||||
if (uBackRead+BUFREADCOMMENT>uMaxBack)
|
||||
uBackRead = uMaxBack;
|
||||
else
|
||||
uBackRead+=BUFREADCOMMENT;
|
||||
uReadPos = uSizeFile-uBackRead ;
|
||||
|
||||
uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
|
||||
(BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
break;
|
||||
|
||||
if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
|
||||
break;
|
||||
|
||||
for (i=(int)uReadSize-3; (i--)>0;)
|
||||
if ((*(buf+i))==(magicCode >> 24 & 0xff) &&
|
||||
(*(buf+i+1))==(magicCode >> 16 & 0xff) &&
|
||||
(*(buf+i+2))==(magicCode >> 8 & 0xff) &&
|
||||
(*(buf+i+3))==(magicCode & 0xff))
|
||||
{
|
||||
uPosFound = uReadPos+i;
|
||||
break;
|
||||
}
|
||||
|
||||
if (uPosFound!=0)
|
||||
break;
|
||||
}
|
||||
TRYFREE(buf);
|
||||
return uPosFound;
|
||||
}
|
||||
|
||||
/*
|
||||
Locate the Central directory of a zipfile (at the end, just before
|
||||
the global comment)
|
||||
*/
|
||||
local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
|
||||
|
||||
local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
|
||||
{
|
||||
return zip64local_SearchCentralDirInternal(pzlib_filefunc_def, filestream, 0x504b0506);
|
||||
}
|
||||
|
||||
#define SIZECENTRALHEADERLOCATOR (0x14) /* 20 */
|
||||
|
||||
/*
|
||||
Locate the Central directory 64 of a zipfile (at the end, just before
|
||||
the global comment)
|
||||
*/
|
||||
local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, const ZPOS64_T endcentraloffset));
|
||||
|
||||
local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, const ZPOS64_T endcentraloffset)
|
||||
{
|
||||
ZPOS64_T relativeOffset;
|
||||
ZPOS64_T uPosFound;
|
||||
uLong uL;
|
||||
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
|
||||
return 0;
|
||||
|
||||
/* Given location of end of central offset record we can */
|
||||
relativeOffset = endcentraloffset + SIZECENTRALHEADERLOCATOR;
|
||||
uPosFound = ZTELL64(*pzlib_filefunc_def,filestream) - relativeOffset;
|
||||
|
||||
if (uPosFound <= 0)
|
||||
return 0;
|
||||
|
||||
/* Zip64 end of central directory locator */
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
return 0;
|
||||
|
||||
/* the signature, already checked */
|
||||
if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
|
||||
return 0;
|
||||
|
||||
/* number of the disk with the start of the zip64 end of central directory */
|
||||
if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
|
||||
return 0;
|
||||
if (uL != 0)
|
||||
return 0;
|
||||
|
||||
/* relative offset of the zip64 end of central directory record */
|
||||
if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
|
||||
return 0;
|
||||
|
||||
/* total number of disks */
|
||||
if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
|
||||
return 0;
|
||||
if (uL != 1)
|
||||
return 0;
|
||||
|
||||
/* Goto Zip64 end of central directory record */
|
||||
if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
return 0;
|
||||
|
||||
/* the signature */
|
||||
if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
|
||||
return 0;
|
||||
|
||||
if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
|
||||
return 0;
|
||||
|
||||
return relativeOffset;
|
||||
}
|
||||
|
||||
int LoadCentralDirectoryRecord(zip64_internal* pziinit)
|
||||
@ -738,81 +746,17 @@ int LoadCentralDirectoryRecord(zip64_internal* pziinit)
|
||||
uLong VersionMadeBy;
|
||||
uLong VersionNeeded;
|
||||
uLong size_comment;
|
||||
|
||||
int hasZIP64Record = 0;
|
||||
|
||||
// check first if we find a ZIP64 record
|
||||
central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
|
||||
if (central_pos > 0)
|
||||
{
|
||||
hasZIP64Record = 1;
|
||||
}
|
||||
else if (central_pos == 0)
|
||||
{
|
||||
central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
|
||||
}
|
||||
|
||||
/* disable to allow appending to empty ZIP archive
|
||||
central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
|
||||
/* disable to allow appending to empty ZIP archive (must be standard zip, not zip64)
|
||||
if (central_pos==0)
|
||||
err=ZIP_ERRNO;
|
||||
*/
|
||||
|
||||
if(hasZIP64Record)
|
||||
if(err == ZIP_OK)
|
||||
{
|
||||
ZPOS64_T sizeEndOfCentralDirectory;
|
||||
if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* the signature, already checked */
|
||||
if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* size of zip64 end of central directory record */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* version made by */
|
||||
if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* version needed to extract */
|
||||
if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* number of this disk */
|
||||
if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&pziinit->number_disk)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* number of the disk with the start of the central directory */
|
||||
if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&pziinit->number_disk_with_CD)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* total number of entries in the central directory on this disk */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* total number of entries in the central directory */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
if (number_entry_CD!=number_entry)
|
||||
err=ZIP_BADZIPFILE;
|
||||
|
||||
/* size of the central directory */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* offset of start of central directory with respect to the starting disk number */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
// TODO..
|
||||
// read the comment from the standard central header.
|
||||
size_comment = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Read End of central Directory info
|
||||
/* read end of central directory info */
|
||||
if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
@ -862,6 +806,68 @@ int LoadCentralDirectoryRecord(zip64_internal* pziinit)
|
||||
/* zipfile global comment length */
|
||||
if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
if ((err==ZIP_OK) && ((number_entry_CD==0xffff) || (offset_central_dir==0xffffffff)))
|
||||
{
|
||||
/* Format should be Zip64, as the central directory or file size is too large */
|
||||
|
||||
central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream,central_pos);
|
||||
if (central_pos)
|
||||
{
|
||||
ZPOS64_T sizeEndOfCentralDirectory;
|
||||
|
||||
hasZIP64Record = 1;
|
||||
|
||||
if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* the signature, already checked */
|
||||
if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* size of zip64 end of central directory record */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* version made by */
|
||||
if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* version needed to extract */
|
||||
if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* number of this disk */
|
||||
if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &pziinit->number_disk)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* number of the disk with the start of the central directory */
|
||||
if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &pziinit->number_disk_with_CD)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* total number of entries in the central directory on this disk */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* total number of entries in the central directory */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
if (number_entry_CD!=number_entry)
|
||||
err=ZIP_BADZIPFILE;
|
||||
|
||||
/* size of the central directory */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
|
||||
/* offset of start of central directory with respect to the
|
||||
starting disk number */
|
||||
if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
|
||||
err=ZIP_ERRNO;
|
||||
}
|
||||
else
|
||||
err=ZIP_BADZIPFILE;
|
||||
}
|
||||
}
|
||||
|
||||
if ((central_pos<offset_central_dir+size_central_dir) &&
|
||||
@ -2124,6 +2130,7 @@ int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centra
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
|
||||
{
|
||||
int err = ZIP_OK;
|
||||
@ -2140,7 +2147,7 @@ int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir,
|
||||
if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
|
||||
{
|
||||
{
|
||||
if(zi->number_entry >= 0xFFFF)
|
||||
if(zi->number_entry >= 0xffff)
|
||||
err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
|
||||
else
|
||||
err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
|
||||
@ -2149,7 +2156,7 @@ int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir,
|
||||
|
||||
if (err==ZIP_OK) /* total number of entries in the central dir */
|
||||
{
|
||||
if(zi->number_entry >= 0xFFFF)
|
||||
if(zi->number_entry >= 0xffff)
|
||||
err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
|
||||
else
|
||||
err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
|
||||
@ -2241,11 +2248,10 @@ extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
|
||||
free_linkedlist(&(zi->central_dir));
|
||||
|
||||
pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
|
||||
if (pos >= 0xffffffff || zi->number_entry > 0xFFFF)
|
||||
if (pos >= 0xffffffff || zi->number_entry > 0xffff)
|
||||
{
|
||||
ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
|
||||
Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
|
||||
|
||||
Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
|
||||
}
|
||||
|
||||
@ -2318,5 +2324,5 @@ extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHe
|
||||
|
||||
TRYFREE(pNewHeader);
|
||||
|
||||
return retVal;
|
||||
return retVal;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user