sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/String: Fix crash 

Former-commit-id: dc3199cfe9fb299000a5c07b26bd6ac611130459
This commit is contained in:
Lynix 2015-11-03 22:34:09 +01:00
parent 69d98fa724
commit fe680c038b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Core/String.cpp
View File

@ -88,6 +88,8 @@ namespace Nz
m_sharedString = std::make_shared<SharedString>(1); m_sharedString = std::make_shared<SharedString>(1);
m_sharedString->string[0] = character; m_sharedString->string[0] = character;
} }
else
m_sharedString = GetEmptyString();
} }
String::String(unsigned int rep, char character) String::String(unsigned int rep, char character)
@ -99,6 +101,8 @@ namespace Nz
if (character != '\0') if (character != '\0')
std::memset(m_sharedString->string.get(), character, rep); std::memset(m_sharedString->string.get(), character, rep);
} }
else
m_sharedString = GetEmptyString();
} }
String::String(unsigned int rep, const char* string) : String::String(unsigned int rep, const char* string) :
@ -117,6 +121,8 @@ namespace Nz
for (unsigned int i = 0; i < rep; ++i) for (unsigned int i = 0; i < rep; ++i)
std::memcpy(&m_sharedString->string[i*length], string, length); std::memcpy(&m_sharedString->string[i*length], string, length);
} }
else
m_sharedString = GetEmptyString();
} }
String::String(unsigned int rep, const String& string) : String::String(unsigned int rep, const String& string) :
@ -136,6 +142,8 @@ namespace Nz
m_sharedString = std::make_shared<SharedString>(length); m_sharedString = std::make_shared<SharedString>(length);
std::memcpy(m_sharedString->string.get(), string, length); std::memcpy(m_sharedString->string.get(), string, length);
} }
else
m_sharedString = GetEmptyString();
} }
String::String(const std::string& string) : String::String(const std::string& string) :