mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-09 07:39:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show an error message instead of triggering a debug breakpoint if a GUI page attempts to include a directory or file from an invalid path.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D2363
Patch By: nani
This was SVN commit r23420.
This commit is contained in:
elexis
2020-01-20 09:58:03 +00:00
parent 5ca68a38ef
commit 02f39840c2
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/CGUI.cpp
+18 -8
View File
@@ -858,22 +858,32 @@ void CGUI::Xeromyces_ReadScript(XMBElement Element, CXeromyces* pFile, std::unor
// If there is a file specified, open and execute it
if (!file.empty())
{
Paths.insert(file);
m_ScriptInterface->LoadGlobalScriptFile(file);
if (!VfsPath(file).IsDirectory())
{
Paths.insert(file);
m_ScriptInterface->LoadGlobalScriptFile(file);
}
else
LOGERROR("GUI: Script path %s is not a file path", file.ToUTF8().c_str());
}
// If it has a directory attribute, read all JS files in that directory
CStrW directory(Element.GetAttributes().GetNamedItem(pFile->GetAttributeID("directory")).FromUTF8());
if (!directory.empty())
{
VfsPaths pathnames;
vfs::GetPathnames(g_VFS, directory, L"*.js", pathnames);
for (const VfsPath& path : pathnames)
if (VfsPath(directory).IsDirectory())
{
// Only load new files (so when the insert succeeds)
if (Paths.insert(path).second)
m_ScriptInterface->LoadGlobalScriptFile(path);
VfsPaths pathnames;
vfs::GetPathnames(g_VFS, directory, L"*.js", pathnames);
for (const VfsPath& path : pathnames)
{
// Only load new files (so when the insert succeeds)
if (Paths.insert(path).second)
m_ScriptInterface->LoadGlobalScriptFile(path);
}
}
else
LOGERROR("GUI: Script path %s is not a directory path", directory.ToUTF8().c_str());
}
CStr code(Element.GetText());