Skip to content

DynArray::EnsureCapacity: make the overflow check survive release builds #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gooh456 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −0
Open

DynArray::EnsureCapacity: make the overflow check survive release builds #1089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions tinyxml2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,13 @@ class DynArray
TIXMLASSERT( cap > 0 );
if ( cap > _allocated ) {
TIXMLASSERT( cap <= SIZE_MAX / 2 / sizeof(T));
if ( cap > SIZE_MAX / 2 / sizeof(T) ) {
// cap*2 below would overflow size_t and wrap to a tiny
// value, giving a too-small allocation followed by an
// out-of-bounds memcpy. TIXMLASSERT is a no-op in release
// builds, so this needs to be a real check.
abort();
}
const size_t newAllocated = cap * 2;
T* newMem = new T[newAllocated];
TIXMLASSERT( newAllocated >= _size );
Expand Down