TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-22 21:05:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1015 from Azaezel/alpha41/consoleCleanups

Browse source 
fix warn reports for buffer over-runs
This commit is contained in:
Brian Roberts 2023-05-09 14:44:01 -05:00 • committed by GitHub
commit 0d981b62cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 93 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/persistence/taml/taml.cpp
View file

@ -644,18 +644,20 @@ ImplementEnumType(_TamlFormatMode,
// Fetch field count.
const U32 fieldCount = fieldList.size();
ConsoleObject* defaultConObject;
SimObject* defaultObject;
ConsoleObject* defaultConObject = NULL;
SimObject* defaultObject = NULL;
if (!getWriteDefaults())
{
// Create a default object of the same type
defaultConObject = ConsoleObject::create(pSimObject->getClassName());
if (!defaultConObject)
return;
defaultObject = dynamic_cast<SimObject*>(defaultConObject);
// ***Really*** shouldn't happen
if (!defaultObject)
return;
}
// ***Really*** shouldn't happen
if (!defaultConObject || !defaultObject)
return;
// Iterate fields.
U8 arrayDepth = 0;
@ -754,7 +756,7 @@ ImplementEnumType(_TamlFormatMode,
}
// Save field/value.
if (arrayDepth > 0 || pField->elementCount > 1)
if (currentArrayNode && (arrayDepth > 0 || pField->elementCount > 1))
currentArrayNode->getChildren()[elementIndex]->addField(fieldName, pFieldValue);
else
{