mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-30 15:10:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix issue 10017

Browse source
This commit is contained in:
Martin Nowak 2013-05-27 17:15:43 +02:00
parent d7d90c7749
commit 2dba41d032
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
std/variant.d
View file

@ -299,6 +299,12 @@ private:
case OpID.copyOut: case OpID.copyOut:
auto target = cast(VariantN *) parm; auto target = cast(VariantN *) parm;
assert(target); assert(target);
static if (target.size < A.sizeof)
{
if (target.type.tsize < A.sizeof)
*cast(A**)&target.store = new A;
}
tryPutting(zis, typeid(A), cast(void*) getPtr(&target.store)) tryPutting(zis, typeid(A), cast(void*) getPtr(&target.store))
|| assert(false); || assert(false);
target.fptr = &handler!(A); target.fptr = &handler!(A);
@ -1881,3 +1887,17 @@ unittest
assert(a == b); assert(a == b);
assert(b == a); assert(b == a);
} }
unittest
{
// http://d.puremagic.com/issues/show_bug.cgi?id=10017
static struct S
{
ubyte[Variant.size + 1] s;
}
Variant v1, v2;
v1 = S(); // the payload is allocated on the heap
v2 = v1; // AssertError: target must be non-null
assert(v1 == v2);
}