Merge pull request #275 from Dmitry-Me/moreOverflowChecks

More overflow checks
This commit is contained in:
Lee Thomason 2015-01-13 13:40:25 -08:00
commit 38b49ae042
1 changed files with 4 additions and 0 deletions

View File

@ -232,11 +232,14 @@ public:
}
void Push( T t ) {
TIXMLASSERT( _size < (size_t)(-1) );
EnsureCapacity( _size+1 );
_mem[_size++] = t;
}
T* PushArr( int count ) {
TIXMLASSERT( count >= 0 );
TIXMLASSERT( _size <= (size_t)(-1) - count );
EnsureCapacity( _size+count );
T* ret = &_mem[_size];
_size += count;
@ -244,6 +247,7 @@ public:
}
T Pop() {
TIXMLASSERT( _size > 0 );
return _mem[--_size];
}