AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #245 from Dmitry-Me/ensureCapacityPreAsserts 

Pre-asserts to ensure no overflow happens
This commit is contained in:
Lee Thomason 2014-12-22 11:27:43 -08:00
parent 4e5900c5e8 9fae869124
commit eaddfd8768
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tinyxml2.h
View File

@ -288,7 +288,9 @@ public:
private: private:
void EnsureCapacity( int cap ) { void EnsureCapacity( int cap ) {
TIXMLASSERT( cap > 0 );
if ( cap > _allocated ) { if ( cap > _allocated ) {
TIXMLASSERT( cap <= INT_MAX / 2 );
int newAllocated = cap * 2; int newAllocated = cap * 2;
T* newMem = new T[newAllocated]; T* newMem = new T[newAllocated];
memcpy( newMem, _mem, sizeof(T)*_size ); // warning: not using constructors, only works for PODs memcpy( newMem, _mem, sizeof(T)*_size ); // warning: not using constructors, only works for PODs