livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some 0-pointer crashes we got with last merge.

Nicky 2014-06-10 22:42:21 +02:00
parent db68b4d7ea
commit e0974593d3
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/llcommon/llerror.cpp
View File

@ -566,7 +566,17 @@ namespace LLError
mFunctionString += std::string(mFunction) + ":";
for (size_t i = 0; i < mTagCount; i++)
{
mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? "" : " ");
// <FS:ND> Tags can be 0, so work around that.
// mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? "" : " ");
char const *pTag = mTags[i];
if( !pTag )
pTag = "<NULL>";
mTagString += std::string("#") + pTag + ((i == mTagCount - 1) ? "" : " ");
// </FS:ND>
}
}
@ -991,6 +1001,11 @@ namespace {
for (size_t i = 0; i < count; i++)
{
// <FS:ND> Can be 0
if( !keys[i] )
continue;
// </FS:ND>
LevelMap::const_iterator it = map.find(keys[i]);
if (it != map.end())
{