mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-02 16:10:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

std.array: check for overflow on allocation sizes

Browse source
This commit is contained in:
Walter Bright 2016-07-25 16:25:07 -07:00
parent 6db08d3dad
commit 842f583b6b
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
std/array.d
View file

@ -629,9 +629,15 @@ private auto arrayAllocImpl(bool minimallyInitialized, T, I...)(I sizes) nothrow
{ {
import core.stdc.string : memset; import core.stdc.string : memset;
import core.memory : GC; import core.memory : GC;
auto ptr = cast(E*) GC.malloc(sizes[0] * E.sizeof, blockAttribute!E);
import core.checkedint : mulu;
bool overflow;
const nbytes = mulu(size, E.sizeof, overflow);
if (overflow) assert(0);
auto ptr = cast(E*) GC.malloc(nbytes, blockAttribute!E);
static if (minimallyInitialized && hasIndirections!E) static if (minimallyInitialized && hasIndirections!E)
memset(ptr, 0, size * E.sizeof); memset(ptr, 0, nbytes);
ret = ptr[0 .. size]; ret = ptr[0 .. size];
} }
} }
@ -2773,8 +2779,14 @@ if (isDynamicArray!A)
} }
} }
// didn't work, must reallocate // didn't work, must reallocate
auto bi = GC.qalloc(newlen * T.sizeof, blockAttribute!T); import core.checkedint : mulu;
bool overflow;
const nbytes = mulu(newlen, T.sizeof, overflow);
if (overflow) assert(0);
auto bi = GC.qalloc(nbytes, blockAttribute!T);
_data.capacity = bi.size / T.sizeof; _data.capacity = bi.size / T.sizeof;
import core.stdc.string : memcpy; import core.stdc.string : memcpy;
if (len) if (len)