marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent SEGV on duplicate material names with different case (#1359)

install-platforms
Julius Michaelis 2017-12-10 15:09:51 +01:00
parent d94dcc8267
commit be10e95698
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/landscape/C4Material.cpp
View File

@ -331,6 +331,10 @@ int32_t C4MaterialMap::Load(C4Group &hGroup)
hGroup.ResetSearch(); int32_t cnt=0;
while (hGroup.FindNextEntry(C4CFN_MaterialFiles,entryname))
{
if (cnt >= mat_num) {
Log("Internal Error: More materials loaded than expected. Make sure your material file names are unique (ignoring case).");
break;
}
// Load mat
if (!pNewMap[cnt].Load(hGroup,entryname))
{ delete [] pNewMap; return 0; }