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

Merge pull request #1239 from bpay/asan-fixes

Browse source 
Fix errors flagged by address sanitizer
This commit is contained in:
Areloch 2015-04-16 21:12:21 -05:00
commit 6e681dd82f
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/gui/controls/guiTextCtrl.cpp
View file

@ -187,8 +187,10 @@ void GuiTextCtrl::setText(const char *txt)
//make sure we don't call this before onAdd();
if( !mProfile )
return;
if (txt)
// The txt pointer is sometimes the same as the mText pointer, so make sure
// we don't call strncpy with overlapping src and dest.
if (txt && txt != mText)
dStrncpy(mText, (UTF8*)txt, MAX_STRING_LENGTH);
mText[MAX_STRING_LENGTH] = '\0';

6
Engine/source/platformWin32/winFileio.cpp
View file

@ -1306,8 +1306,10 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve
// Compose our search string - Format : ([path]/[subpath]/*)
//-----------------------------------------------------------------------------
char trail = basePath[ dStrlen(basePath) - 1 ];
char subTrail = subPath ? subPath[ dStrlen(subPath) - 1 ] : '\0';
dsize_t trLen = basePath ? dStrlen(basePath) : 0;
dsize_t subtrLen = subPath ? dStrlen(subPath) : 0;
char trail = trLen > 0 ? basePath[ trLen - 1 ] : '\0';
char subTrail = subtrLen > 0 ? subPath[ subtrLen - 1 ] : '\0';
if( trail == '/' )
{