420d0d50bc
Security update, fixes CVE-2018-25032 in zlib. Preliminary assessment doesn't show Godot as affected since we don't seem to call `deflate` with the problematic parameters, but the extent of the vulnerability is not fully clear upstream yet.
267 lines
8.5 KiB
C
267 lines
8.5 KiB
C
/* ioapi.h -- IO base function header for compress/uncompress .zip
|
|
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
|
|
|
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
|
|
|
Modifications for Zip64 support
|
|
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
|
|
|
For more info read MiniZip_info.txt
|
|
|
|
*/
|
|
|
|
#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
|
|
#define _CRT_SECURE_NO_WARNINGS
|
|
#endif
|
|
|
|
#if defined(__APPLE__) || defined(IOAPI_NO_64)
|
|
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
|
|
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
|
|
#define FTELLO_FUNC(stream) ftello(stream)
|
|
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
|
|
#else
|
|
#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
|
|
#define FTELLO_FUNC(stream) ftello64(stream)
|
|
#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
|
|
#endif
|
|
|
|
|
|
#include "ioapi.h"
|
|
|
|
voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
|
|
{
|
|
if (pfilefunc->zfile_func64.zopen64_file != NULL)
|
|
return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
|
|
else
|
|
{
|
|
return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
|
|
}
|
|
}
|
|
|
|
long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
|
|
{
|
|
if (pfilefunc->zfile_func64.zseek64_file != NULL)
|
|
return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
|
|
else
|
|
{
|
|
uLong offsetTruncated = (uLong)offset;
|
|
if (offsetTruncated != offset)
|
|
return -1;
|
|
else
|
|
return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
|
|
}
|
|
}
|
|
|
|
ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
|
|
{
|
|
if (pfilefunc->zfile_func64.zseek64_file != NULL)
|
|
return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
|
|
else
|
|
{
|
|
uLong tell_uLong = (uLong)(*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
|
|
if ((tell_uLong) == MAXU32)
|
|
return (ZPOS64_T)-1;
|
|
else
|
|
return tell_uLong;
|
|
}
|
|
}
|
|
|
|
void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
|
|
{
|
|
p_filefunc64_32->zfile_func64.zopen64_file = NULL;
|
|
p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
|
|
p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
|
|
p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
|
|
p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
|
|
p_filefunc64_32->zfile_func64.ztell64_file = NULL;
|
|
p_filefunc64_32->zfile_func64.zseek64_file = NULL;
|
|
p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
|
|
p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
|
|
p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
|
|
p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
|
|
p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
|
|
/* GODOT start */
|
|
p_filefunc64_32->zfile_func64.alloc_mem = p_filefunc32->alloc_mem;
|
|
p_filefunc64_32->zfile_func64.free_mem = p_filefunc32->free_mem;
|
|
/* GODOT end */
|
|
}
|
|
|
|
/* GODOT start */
|
|
/*
|
|
// GODOT end
|
|
|
|
|
|
static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
|
|
static uLong ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
|
|
static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
|
|
static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
|
|
static long ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
|
|
static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
|
|
static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
|
|
|
|
static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
|
|
{
|
|
(void)opaque;
|
|
FILE* file = NULL;
|
|
const char* mode_fopen = NULL;
|
|
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
|
|
mode_fopen = "rb";
|
|
else
|
|
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
|
|
mode_fopen = "r+b";
|
|
else
|
|
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
|
|
mode_fopen = "wb";
|
|
|
|
if ((filename!=NULL) && (mode_fopen != NULL))
|
|
file = fopen(filename, mode_fopen);
|
|
return file;
|
|
}
|
|
|
|
static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
|
|
{
|
|
(void)opaque;
|
|
FILE* file = NULL;
|
|
const char* mode_fopen = NULL;
|
|
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
|
|
mode_fopen = "rb";
|
|
else
|
|
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
|
|
mode_fopen = "r+b";
|
|
else
|
|
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
|
|
mode_fopen = "wb";
|
|
|
|
if ((filename!=NULL) && (mode_fopen != NULL))
|
|
file = FOPEN_FUNC((const char*)filename, mode_fopen);
|
|
return file;
|
|
}
|
|
|
|
|
|
static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
|
|
{
|
|
(void)opaque;
|
|
uLong ret;
|
|
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
|
|
return ret;
|
|
}
|
|
|
|
static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
|
|
{
|
|
(void)opaque;
|
|
uLong ret;
|
|
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
|
|
return ret;
|
|
}
|
|
|
|
static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
|
|
{
|
|
(void)opaque;
|
|
long ret;
|
|
ret = ftell((FILE *)stream);
|
|
return ret;
|
|
}
|
|
|
|
|
|
static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
|
|
{
|
|
(void)opaque;
|
|
ZPOS64_T ret;
|
|
ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream);
|
|
return ret;
|
|
}
|
|
|
|
static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin)
|
|
{
|
|
(void)opaque;
|
|
int fseek_origin=0;
|
|
long ret;
|
|
switch (origin)
|
|
{
|
|
case ZLIB_FILEFUNC_SEEK_CUR :
|
|
fseek_origin = SEEK_CUR;
|
|
break;
|
|
case ZLIB_FILEFUNC_SEEK_END :
|
|
fseek_origin = SEEK_END;
|
|
break;
|
|
case ZLIB_FILEFUNC_SEEK_SET :
|
|
fseek_origin = SEEK_SET;
|
|
break;
|
|
default: return -1;
|
|
}
|
|
ret = 0;
|
|
if (fseek((FILE *)stream, (long)offset, fseek_origin) != 0)
|
|
ret = -1;
|
|
return ret;
|
|
}
|
|
|
|
static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
|
|
{
|
|
(void)opaque;
|
|
int fseek_origin=0;
|
|
long ret;
|
|
switch (origin)
|
|
{
|
|
case ZLIB_FILEFUNC_SEEK_CUR :
|
|
fseek_origin = SEEK_CUR;
|
|
break;
|
|
case ZLIB_FILEFUNC_SEEK_END :
|
|
fseek_origin = SEEK_END;
|
|
break;
|
|
case ZLIB_FILEFUNC_SEEK_SET :
|
|
fseek_origin = SEEK_SET;
|
|
break;
|
|
default: return -1;
|
|
}
|
|
ret = 0;
|
|
|
|
if(FSEEKO_FUNC((FILE *)stream, (long)offset, fseek_origin) != 0)
|
|
ret = -1;
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
|
|
{
|
|
(void)opaque;
|
|
int ret;
|
|
ret = fclose((FILE *)stream);
|
|
return ret;
|
|
}
|
|
|
|
static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
|
|
{
|
|
(void)opaque;
|
|
int ret;
|
|
ret = ferror((FILE *)stream);
|
|
return ret;
|
|
}
|
|
|
|
void fill_fopen_filefunc (pzlib_filefunc_def)
|
|
zlib_filefunc_def* pzlib_filefunc_def;
|
|
{
|
|
pzlib_filefunc_def->zopen_file = fopen_file_func;
|
|
pzlib_filefunc_def->zread_file = fread_file_func;
|
|
pzlib_filefunc_def->zwrite_file = fwrite_file_func;
|
|
pzlib_filefunc_def->ztell_file = ftell_file_func;
|
|
pzlib_filefunc_def->zseek_file = fseek_file_func;
|
|
pzlib_filefunc_def->zclose_file = fclose_file_func;
|
|
pzlib_filefunc_def->zerror_file = ferror_file_func;
|
|
pzlib_filefunc_def->opaque = NULL;
|
|
}
|
|
|
|
void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def)
|
|
{
|
|
pzlib_filefunc_def->zopen64_file = fopen64_file_func;
|
|
pzlib_filefunc_def->zread_file = fread_file_func;
|
|
pzlib_filefunc_def->zwrite_file = fwrite_file_func;
|
|
pzlib_filefunc_def->ztell64_file = ftell64_file_func;
|
|
pzlib_filefunc_def->zseek64_file = fseek64_file_func;
|
|
pzlib_filefunc_def->zclose_file = fclose_file_func;
|
|
pzlib_filefunc_def->zerror_file = ferror_file_func;
|
|
pzlib_filefunc_def->opaque = NULL;
|
|
}
|
|
// GODOT start
|
|
*/
|
|
/* GODOT end */
|