Skip to content

Commit 1bd806b

Browse files
Synchronize changes from 1.6 master branch [ci skip]
2c522d9 Addendum #2 to 53524d9 3adf322 Visual Studio Update
2 parents edff874 + 2c522d9 commit 1bd806b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

vendor/cegui-0.4.0-custom/src/tinyxml/tinystr.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,13 @@ void TiXmlString::append( const char* str, int len )
181181
{
182182
// we know we can safely append the new string
183183
// strncat (cstring, str, len);
184-
memcpy (cstring + length (),
184+
unsigned old_length = current_length;
185+
current_length = new_size - 1;
186+
memcpy (cstring + old_length,
185187
str,
186188
size_suffix);
189+
cstring [current_length] = 0;
187190
}
188-
current_length = new_size - 1;
189-
cstring [current_length] = 0;
190191
}
191192

192193

0 commit comments

Comments
 (0)