YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-30 08:44:31 +00:00
Code Issues Projects Releases Wiki Activity

engine: filesystem: accept ZIP files with zip extension, do not assert with NULL free in Zip_Close

Browse Source
This commit is contained in:
Alibek Omarov 2022-01-13 16:44:45 +03:00
parent c3513b1615
commit e29dcb4125
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/common/filesystem.c
View File

@ -928,7 +928,8 @@ void Zip_Close( zip_t *zip )
if( !zip ) if( !zip )
return; return;
Mem_Free( zip->files ); if( zip->files )
Mem_Free( zip->files );
FS_EnsureOpenZip( NULL ); FS_EnsureOpenZip( NULL );
@ -1209,7 +1210,7 @@ qboolean FS_AddZip_Fullpath( const char *zipfile, qboolean *already_loaded, int
if( already_loaded ) *already_loaded = false; if( already_loaded ) *already_loaded = false;
if( !Q_stricmp( ext, "pk3" ) ) if( !Q_stricmp( ext, "pk3" ) || !Q_stricmp( ext, "zip" ))
zip = FS_LoadZip( zipfile, &errorcode ); zip = FS_LoadZip( zipfile, &errorcode );
if( zip ) if( zip )