zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a number of cases where files opened with cache1d.cpp's kopen_internal() could be leaked.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6570 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
pogokeen 2017-12-18 23:36:05 +00:00
parent d9b0479343
commit 741305e976
6 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/build/src/defs.cpp
View file

@ -678,7 +678,10 @@ static int32_t defsparser(scriptfile *script)
artheader_t local; artheader_t local;
int32_t headerval = E_ReadArtFileHeader(fil, fn, &local); int32_t headerval = E_ReadArtFileHeader(fil, fn, &local);
if (headerval != 0) if (headerval != 0)
{
kclose(fil);
break; break;
}
if (havetile) if (havetile)
{ {

3
source/build/src/engine.cpp
View file

@ -9134,7 +9134,10 @@ int32_t loadboard(const char *filename, char flags, vec3_t *dapos, int16_t *daan
{ mapversion = 7; return -1; } { mapversion = 7; return -1; }
if (kread(fil, &mapversion, 4) != 4) if (kread(fil, &mapversion, 4) != 4)
{
kclose(fil);
return -2; return -2;
}
{ {
int32_t ok = 0; int32_t ok = 0;

3
source/build/src/lunatic.cpp
View file

@ -73,7 +73,10 @@ static int32_t read_whole_file(const char *fn, char **retbufptr)
flen = kfilelength(fid); flen = kfilelength(fid);
if (flen == 0) if (flen == 0)
{
kclose(fid);
return 5; return 5;
}
buf = (char *)Xmalloc(flen+1); buf = (char *)Xmalloc(flen+1);

3
source/build/src/tiles.cpp
View file

@ -440,7 +440,10 @@ static int32_t E_ReadArtFileOfID(int32_t tilefilei)
artheader_t local; artheader_t local;
int const headerval = E_ReadArtFileHeader(fil, fn, &local); int const headerval = E_ReadArtFileHeader(fil, fn, &local);
if (headerval != 0) if (headerval != 0)
{
kclose(fil);
return headerval; return headerval;
}
if (permap) if (permap)
{ {

1
source/duke3d/src/anim.cpp
View file

@ -295,6 +295,7 @@ int32_t Anim_Play(const char *fn)
{ {
OSD_Printf("Error initializing VPX codec.\n"); OSD_Printf("Error initializing VPX codec.\n");
animvpx_restore_glstate(); animvpx_restore_glstate();
kclose(handle);
return 0; return 0;
} }

3
source/duke3d/src/savegame.cpp
View file

@ -166,7 +166,10 @@ static void ReadSaveGameHeaders_CACHE1D(CACHE1D_FIND_REC *f)
if (k > 0) if (k > 0)
msv.isOldVer = 1; msv.isOldVer = 1;
else else
{
kclose(fil);
continue; continue;
}
// else h.savename is all zeros (fatal failure, like wrong header // else h.savename is all zeros (fatal failure, like wrong header
// magic or too short header) // magic or too short header)
} }