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

Fix d73a3f59ad - wstring_view on a temporary & wrong utf16->8 conversion.

Browse Source 
Two issues:
- The wstring_view was created on a temporary string - the data got
overwritten sometimes.
- there was some weird UTF16->UTF8 conversion going on.


Reported by: langbart
Differential Revision: https://code.wildfiregames.com/D3828
This was SVN commit r25226.
This commit is contained in:
wraitii
2021-04-09 18:08:37 +00:00
parent fc60d80af1
commit fcc6bbe797
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/TemplateLoader.cpp
+4 -4
View File
@@ -91,17 +91,17 @@ static Status AddToTemplates(const VfsPath& pathname, const CFileInfo& UNUSED(fi
// Strip the .xml extension
VfsPath pathstem = pathname.ChangeExtension(L"");
// Strip the root from the path
std::wstring_view name = pathstem.string().substr(ARRAY_SIZE(TEMPLATE_ROOT)-1);
std::string name = pathstem.string8().substr(ARRAY_SIZE(TEMPLATE_ROOT)-1);
// We want to ignore template_*.xml templates, since they should never be built in the editor
if (name.substr(0, 9) == L"template_")
if (name.substr(0, 9) == "template_")
return INFO::OK;
// Also ignore some subfolders.
if (name.substr(0, 8) == L"special/" || name.substr(0, 7) == L"mixins/")
if (name.substr(0, 8) == "special/" || name.substr(0, 7) == "mixins/")
return INFO::OK;
templates.push_back(std::string(name.begin(), name.end()));
templates.push_back(name);
return INFO::OK;
}