TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 15:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1303 from jamesu/console_vstring_fix

Browse source 
Add workaround for issue #1292
This commit is contained in:
Areloch 2015-05-24 23:19:54 -05:00
commit eea608dec2
3 changed files with 67 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1759,12 +1759,34 @@ const char *ConsoleValue::getStringValue()
return sval; return sval;
else if (type == TypeInternalStringStackPtr) else if (type == TypeInternalStringStackPtr)
return STR.mBuffer + (uintptr_t)sval; return STR.mBuffer + (uintptr_t)sval;
if(type == TypeInternalFloat)
return Con::getData(TypeF32, &fval, 0);
else if(type == TypeInternalInt)
return Con::getData(TypeS32, &ival, 0);
else else
return Con::getData(type, dataPtr, 0, enumTable); {
// We need a string representation, so lets create one
const char *internalValue = NULL;
if(type == TypeInternalFloat)
internalValue = Con::getData(TypeF32, &fval, 0);
else if(type == TypeInternalInt)
internalValue = Con::getData(TypeS32, &ival, 0);
else
return Con::getData(type, dataPtr, 0, enumTable); // We can't save sval here since it is the same as dataPtr
if (!internalValue)
return "";
U32 stringLen = dStrlen(internalValue);
U32 newLen = ((stringLen + 1) + 15) & ~15; // pad upto next cache line
if (bufferLen == 0)
sval = (char *) dMalloc(newLen);
else if(newLen > bufferLen)
sval = (char *) dRealloc(sval, newLen);
dStrcpy(sval, internalValue);
bufferLen = newLen;
return sval;
}
} }
StringStackPtr ConsoleValue::getStringStackPtr() StringStackPtr ConsoleValue::getStringStackPtr()
@ -1800,11 +1822,13 @@ void ConsoleValue::setIntValue(U32 val)
{ {
fval = (F32)val; fval = (F32)val;
ival = val; ival = val;
if(sval != typeValueEmpty) if(bufferLen > 0)
{ {
if (type != TypeInternalStackString && type != TypeInternalStringStackPtr) dFree(sval); dFree(sval);
sval = typeValueEmpty; bufferLen = 0;
} }
sval = typeValueEmpty;
type = TypeInternalInt; type = TypeInternalInt;
} }
else else
@ -1825,11 +1849,12 @@ void ConsoleValue::setFloatValue(F32 val)
{ {
fval = val; fval = val;
ival = static_cast<U32>(val); ival = static_cast<U32>(val);
if(sval != typeValueEmpty) if(bufferLen > 0)
{ {
if (type != TypeInternalStackString && type != TypeInternalStringStackPtr) dFree(sval); dFree(sval);
sval = typeValueEmpty; bufferLen = 0;
} }
sval = typeValueEmpty;
type = TypeInternalFloat; type = TypeInternalFloat;
} }
else else

9
Engine/source/console/console.h
View file

@ -186,19 +186,20 @@ public:
fval = 0; fval = 0;
sval = typeValueEmpty; sval = typeValueEmpty;
bufferLen = 0; bufferLen = 0;
type = TypeInternalString; type = TypeInternalString;
} }
void cleanup() void cleanup()
{ {
if (type <= TypeInternalString && if (bufferLen > 0)
sval != typeValueEmpty && type != TypeInternalStackString && type != TypeInternalStringStackPtr) {
dFree(sval); dFree(sval);
bufferLen = 0;
}
sval = typeValueEmpty; sval = typeValueEmpty;
type = ConsoleValue::TypeInternalString; type = ConsoleValue::TypeInternalString;
ival = 0; ival = 0;
fval = 0; fval = 0;
bufferLen = 0;
} }
}; };

40
Engine/source/console/consoleInternal.cpp
View file

@ -512,13 +512,17 @@ void ConsoleValue::setStringValue(const char * value)
*/ */
if (value == typeValueEmpty) if (value == typeValueEmpty)
{ {
if (sval && sval != typeValueEmpty && type != TypeInternalStackString && type != TypeInternalStringStackPtr) dFree(sval); if (bufferLen > 0)
sval = typeValueEmpty; {
dFree(sval);
bufferLen = 0; bufferLen = 0;
fval = 0.f; }
ival = 0;
type = TypeInternalString; sval = typeValueEmpty;
return; fval = 0.f;
ival = 0;
type = TypeInternalString;
return;
} }
U32 stringLen = dStrlen(value); U32 stringLen = dStrlen(value);
@ -541,7 +545,7 @@ void ConsoleValue::setStringValue(const char * value)
// may as well pad to the next cache line // may as well pad to the next cache line
U32 newLen = ((stringLen + 1) + 15) & ~15; U32 newLen = ((stringLen + 1) + 15) & ~15;
if(sval == typeValueEmpty || type == TypeInternalStackString || type == TypeInternalStringStackPtr) if(bufferLen == 0)
sval = (char *) dMalloc(newLen); sval = (char *) dMalloc(newLen);
else if(newLen > bufferLen) else if(newLen > bufferLen)
sval = (char *) dRealloc(sval, newLen); sval = (char *) dRealloc(sval, newLen);
@ -562,11 +566,16 @@ void ConsoleValue::setStackStringValue(const char *value)
if(type <= ConsoleValue::TypeInternalString) if(type <= ConsoleValue::TypeInternalString)
{ {
// sval might still be temporarily present so we need to check and free it
if (bufferLen > 0)
{
dFree(sval);
bufferLen = 0;
}
if (value == typeValueEmpty) if (value == typeValueEmpty)
{ {
if (sval && sval != typeValueEmpty && type != ConsoleValue::TypeInternalStackString && type != ConsoleValue::TypeInternalStringStackPtr) dFree(sval);
sval = typeValueEmpty; sval = typeValueEmpty;
bufferLen = 0;
fval = 0.f; fval = 0.f;
ival = 0; ival = 0;
type = TypeInternalString; type = TypeInternalString;
@ -587,7 +596,7 @@ void ConsoleValue::setStackStringValue(const char *value)
type = TypeInternalStackString; type = TypeInternalStackString;
sval = (char*)value; sval = (char*)value;
bufferLen = stringLen; bufferLen = 0;
} }
else else
Con::setData(type, dataPtr, 0, 1, &value, enumTable); Con::setData(type, dataPtr, 0, 1, &value, enumTable);
@ -598,7 +607,11 @@ void ConsoleValue::setStringStackPtrValue(StringStackPtr ptrValue)
if(type <= ConsoleValue::TypeInternalString) if(type <= ConsoleValue::TypeInternalString)
{ {
const char *value = StringStackPtrRef(ptrValue).getPtr(&STR); const char *value = StringStackPtrRef(ptrValue).getPtr(&STR);
if (sval && sval != typeValueEmpty && type != ConsoleValue::TypeInternalStackString && type != TypeInternalStringStackPtr) dFree(sval); if (bufferLen > 0)
{
dFree(sval);
bufferLen = 0;
}
U32 stringLen = dStrlen(value); U32 stringLen = dStrlen(value);
if(stringLen < 256) if(stringLen < 256)
@ -614,7 +627,7 @@ void ConsoleValue::setStringStackPtrValue(StringStackPtr ptrValue)
type = TypeInternalStringStackPtr; type = TypeInternalStringStackPtr;
sval = (char*)(value - STR.mBuffer); sval = (char*)(value - STR.mBuffer);
bufferLen = stringLen; bufferLen = 0;
} }
else else
{ {
@ -680,8 +693,7 @@ Dictionary::Entry* Dictionary::addVariable( const char *name,
Entry *ent = add(StringTable->insert(name)); Entry *ent = add(StringTable->insert(name));
if ( ent->value.type <= ConsoleValue::TypeInternalString && if ( ent->value.type <= ConsoleValue::TypeInternalString &&
ent->value.sval != typeValueEmpty && ent->value.bufferLen > 0 )
ent->value.type != ConsoleValue::TypeInternalStackString && ent->value.type != ConsoleValue::TypeInternalStringStackPtr )
dFree(ent->value.sval); dFree(ent->value.sval);
ent->value.type = type; ent->value.type = type;