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

Fixed stack corruption 

Former-commit-id: 0ec71c8cc8f69d3dbf3b8ffda6556a9eebfeac1e
This commit is contained in:
Lynix 2013-06-19 14:33:06 +02:00
parent b0c46b2384
commit 3f9faa3a5a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Core/ByteArray.cpp
View File

@ -134,7 +134,7 @@ NzByteArray& NzByteArray::Insert(int pos, const nzUInt8* buffer, unsigned int le
{ {
EnsureOwnership(); EnsureOwnership();
std::memmove(&m_sharedArray->buffer[start+length], &m_sharedArray->buffer[start], m_sharedArray->size); std::memmove(&m_sharedArray->buffer[start+length], &m_sharedArray->buffer[start], m_sharedArray->size - start);
std::memcpy(&m_sharedArray->buffer[start], buffer, length); std::memcpy(&m_sharedArray->buffer[start], buffer, length);
m_sharedArray->size += length; m_sharedArray->size += length;

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

@ -1893,7 +1893,7 @@ unsigned int NzString::GetWordPosition(unsigned int index, nzUInt32 flags) const
NzString& NzString::Insert(int pos, char character) NzString& NzString::Insert(int pos, char character)
{ {
return Insert(pos, &character); return Insert(pos, &character, 1);
} }
NzString& NzString::Insert(int pos, const char* string) NzString& NzString::Insert(int pos, const char* string)
@ -1916,7 +1916,7 @@ NzString& NzString::Insert(int pos, const char* string, unsigned int length)
{ {
EnsureOwnership(); EnsureOwnership();
std::memmove(&m_sharedString->string[start+length], &m_sharedString->string[start], m_sharedString->size); std::memmove(&m_sharedString->string[start+length], &m_sharedString->string[start], m_sharedString->size - start);
std::memcpy(&m_sharedString->string[start], string, length); std::memcpy(&m_sharedString->string[start], string, length);
m_sharedString->size += length; m_sharedString->size += length;