TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-24 17:13:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix issue with registered variables becoming corrupted when string value was accessed.

Browse source
This commit is contained in:
James Urquhart 2015-05-16 14:50:20 +01:00
parent 3a218217f4
commit 15169eab9f
3 changed files with 43 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Engine/source/console/console.cpp
View file

@ -1769,7 +1769,7 @@ const char *ConsoleValue::getStringValue()
else if(type == TypeInternalInt)
internalValue = Con::getData(TypeS32, &ival, 0);
else
internalValue = Con::getData(type, dataPtr, 0, enumTable);
return Con::getData(type, dataPtr, 0, enumTable); // We can't save sval here since it is the same as dataPtr
if (!internalValue)
return "";
@ -1777,12 +1777,14 @@ const char *ConsoleValue::getStringValue()
U32 stringLen = dStrlen(internalValue);
U32 newLen = ((stringLen + 1) + 15) & ~15; // pad upto next cache line
if(sval == typeValueEmpty || type == TypeInternalStackString || type == TypeInternalStringStackPtr)
if (bufferLen == 0)
sval = (char *) dMalloc(newLen);
else if(newLen > bufferLen)
sval = (char *) dRealloc(sval, newLen);
dStrcpy(sval, internalValue);
bufferLen = newLen;
return sval;
}
}
@ -1820,11 +1822,13 @@ void ConsoleValue::setIntValue(U32 val)
{
fval = (F32)val;
ival = val;
if(sval != typeValueEmpty)
if(bufferLen > 0)
{
if (type != TypeInternalStackString && type != TypeInternalStringStackPtr) dFree(sval);
sval = typeValueEmpty;
dFree(sval);
bufferLen = 0;
}
sval = typeValueEmpty;
type = TypeInternalInt;
}
else
@ -1845,11 +1849,12 @@ void ConsoleValue::setFloatValue(F32 val)
{
fval = val;
ival = static_cast<U32>(val);
if(sval != typeValueEmpty)
if(bufferLen > 0)
{
if (type != TypeInternalStackString && type != TypeInternalStringStackPtr) dFree(sval);
sval = typeValueEmpty;
dFree(sval);
bufferLen = 0;
}
sval = typeValueEmpty;
type = TypeInternalFloat;
}
else