immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev-graphics

dev-ui
adiblol 2012-09-30 16:01:39 +02:00
parent 85d253b094 cb634db2ec
commit 8f99efd861
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CBot/CBotString.cpp
View File

@ -357,9 +357,9 @@ const CBotString& CBotString::operator+(const CBotString& stringSrc)
{
char* p = static_cast<char*>(malloc(m_lg+stringSrc.m_lg+1));
strcpy(p, m_ptr);
if (m_ptr!=NULL) strcpy(p, m_ptr);
char* pp = p + m_lg;
strcpy(pp, stringSrc.m_ptr);
if (stringSrc.m_ptr!=NULL) strcpy(pp, stringSrc.m_ptr);
free(m_ptr);
m_ptr = p;