diff options
| author | adiblol <adiblol@hydrogen> | 2012-09-30 16:01:39 +0200 |
|---|---|---|
| committer | adiblol <adiblol@hydrogen> | 2012-09-30 16:01:39 +0200 |
| commit | 8f99efd861d889c720782569a975fd6df6f5fa94 (patch) | |
| tree | 56c9e629d423188e5e1c77958218da7af446f508 /src | |
| parent | 85d253b094555b969dccffe7d34345b0969c59df (diff) | |
| parent | cb634db2eca3857290fd16f75627a506d6aea32a (diff) | |
| download | colobot-8f99efd861d889c720782569a975fd6df6f5fa94.tar.gz colobot-8f99efd861d889c720782569a975fd6df6f5fa94.tar.bz2 colobot-8f99efd861d889c720782569a975fd6df6f5fa94.zip | |
Merge remote-tracking branch 'origin/dev' into dev-graphics
Diffstat (limited to 'src')
| -rw-r--r-- | src/CBot/CBotString.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CBot/CBotString.cpp b/src/CBot/CBotString.cpp index e52cd05..6f48127 100644 --- a/src/CBot/CBotString.cpp +++ b/src/CBot/CBotString.cpp @@ -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; |