Skip to content

container.array.sorting.d: add overflow checks #4717

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

Merged
schveiguy merged 1 commit into from
Aug 5, 2016
Merged

container.array.sorting.d: add overflow checks #4717

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
22 changes: 18 additions & 4 deletions std/container/array.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,12 @@ if (!is(Unqual!T == bool))
}
// enlarge
auto startEmplace = length;
import core.checkedint : mulu;
bool overflow;
const nbytes = mulu(newLength, T.sizeof, overflow);
if (overflow) assert(0);
_payload = (cast(T*) realloc(_payload.ptr,
T.sizeof * newLength))[0 .. newLength];
nbytes))[0 .. newLength];
initializeAll(_payload.ptr[startEmplace .. length]);
}

Expand All @@ -340,7 +344,10 @@ if (!is(Unqual!T == bool))
void reserve(size_t elements)
{
if (elements <= capacity) return;
immutable sz = elements * T.sizeof;
import core.checkedint : mulu;
bool overflow;
const sz = mulu(elements, T.sizeof, overflow);
if (overflow) assert(0);
static if (hasIndirections!T) // should use hasPointers instead
{
/* Because of the transactional nature of this
Expand Down Expand Up @@ -421,7 +428,11 @@ Constructor taking a number of items
this(U)(U[] values...) if (isImplicitlyConvertible!(U, T))
{
import std.conv : emplace;
auto p = cast(T*) malloc(T.sizeof * values.length);
import core.checkedint : mulu;
bool overflow;
const nbytes = mulu(values.length, T.sizeof, overflow);
if (overflow) assert(0);
auto p = cast(T*) malloc(nbytes);
static if (hasIndirections!T)
{
if (p)
Expand Down Expand Up @@ -533,7 +544,10 @@ Complexity: $(BIGOH 1)
if (!_data.refCountedStore.isInitialized)
{
if (!elements) return;
immutable sz = elements * T.sizeof;
import core.checkedint : mulu;
bool overflow;
const sz = mulu(elements, T.sizeof, overflow);
if (overflow) assert(0);
auto p = enforce(malloc(sz));
static if (hasIndirections!T)
{
Expand Down