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

Merge pull request #1333 from Azaezel/PluggingLeaks

Browse source 
Plugging Memory Leaks
This commit is contained in:
Daniel Buckmaster 2015-06-28 14:41:13 +10:00
commit d89c3b7c6f
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -191,7 +191,7 @@ public:
void cleanup() void cleanup()
{ {
if (bufferLen > 0) if ((type <= TypeInternalString) && (bufferLen > 0))
{ {
dFree(sval); dFree(sval);
bufferLen = 0; bufferLen = 0;
@ -201,6 +201,8 @@ public:
ival = 0; ival = 0;
fval = 0; fval = 0;
} }
ConsoleValue(){ init(); };
~ConsoleValue(){ cleanup(); };
}; };
// Proxy class for console variables // Proxy class for console variables

9
Engine/source/platform/profiler.cpp
View file

@ -212,11 +212,14 @@ Profiler::~Profiler()
void Profiler::reset() void Profiler::reset()
{ {
mEnabled = false; // in case we're in a profiler call. mEnabled = false; // in case we're in a profiler call.
while(mProfileList) ProfilerData * head = mProfileList;
ProfilerData * curr = NULL;
while ((curr = head) != NULL)
{ {
free(mProfileList); head = head->mNextProfilerData;
mProfileList = NULL; free(curr);
} }
for(ProfilerRootData *walk = ProfilerRootData::sRootList; walk; walk = walk->mNextRoot) for(ProfilerRootData *walk = ProfilerRootData::sRootList; walk; walk = walk->mNextRoot)
{ {
walk->mFirstProfilerData = 0; walk->mFirstProfilerData = 0;