TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-29 00:59:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #666 from Ragora/bugfix-asset-importer-oob

Browse source 
BugFix: Correct ASAN reported out of bounds reads in AssetImporter
This commit is contained in:
Brian Roberts 2021-11-08 14:36:31 -06:00 • committed by GitHub
commit 529bfbddc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/T3D/assets/assetImporter.cpp
View file

@ -721,27 +721,27 @@ String AssetImporter::parseImageSuffixes(String assetName, String* suffixType)
{
case 0:
suffixList = activeImportConfig->DiffuseTypeSuffixes;
suffixType->insert(0, "Albedo", 10);
suffixType->insert(0, "Albedo", 6);
break;
case 1:
suffixList = activeImportConfig->NormalTypeSuffixes;
suffixType->insert(0, "Normal", 10);
suffixType->insert(0, "Normal", 6);
break;
case 2:
suffixList = activeImportConfig->RoughnessTypeSuffixes;
suffixType->insert(0, "Roughness", 10);
suffixType->insert(0, "Roughness", 9);
break;
case 3:
suffixList = activeImportConfig->AOTypeSuffixes;
suffixType->insert(0, "AO", 10);
suffixType->insert(0, "AO", 2);
break;
case 4:
suffixList = activeImportConfig->MetalnessTypeSuffixes;
suffixType->insert(0, "Metalness", 10);
suffixType->insert(0, "Metalness", 9);
break;
case 5:
suffixList = activeImportConfig->PBRTypeSuffixes;
suffixType->insert(0, "ORMConfig", 10);
suffixType->insert(0, "ORMConfig", 9);
break;
default:
suffixList = "";