zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable -file "" 

- This isn't a real file or even a name, but the game would try and load
  it, including running through various permutations, potentially resulting
  in loading the current directory as an archive.
This commit is contained in:
Randy Heit 2016-02-06 17:47:55 -06:00
parent 20aa7c75de
commit cbfb24ef33
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/d_main.cpp
View File

@ -1476,7 +1476,7 @@ void ParseCVarInfo()
bool D_AddFile (TArray<FString> &wadfiles, const char *file, bool check, int position) bool D_AddFile (TArray<FString> &wadfiles, const char *file, bool check, int position)
{ {
if (file == NULL) if (file == NULL || *file == '\0')
{ {
return false; return false;
} }
@ -1507,6 +1507,10 @@ bool D_AddFile (TArray<FString> &wadfiles, const char *file, bool check, int pos
void D_AddWildFile (TArray<FString> &wadfiles, const char *value) void D_AddWildFile (TArray<FString> &wadfiles, const char *value)
{ {
if (value == NULL || *value == '\0')
{
return;
}
const char *wadfile = BaseFileSearch (value, ".wad"); const char *wadfile = BaseFileSearch (value, ".wad");
if (wadfile != NULL) if (wadfile != NULL)
@ -1648,6 +1652,10 @@ static const char *BaseFileSearch (const char *file, const char *ext, bool lookf
{ {
static char wad[PATH_MAX]; static char wad[PATH_MAX];
if (file == NULL || *file == '\0')
{
return NULL;
}
if (lookfirstinprogdir) if (lookfirstinprogdir)
{ {
mysnprintf (wad, countof(wad), "%s%s%s", progdir.GetChars(), progdir[progdir.Len() - 1] != '/' ? "/" : "", file); mysnprintf (wad, countof(wad), "%s%s%s", progdir.GetChars(), progdir[progdir.Len() - 1] != '/' ? "/" : "", file);