From 2dba41d0323f518ad41300e5bd3cf0ff5665029d Mon Sep 17 00:00:00 2001
From: Martin Nowak <code@dawg.eu>
Date: Mon, 27 May 2013 17:15:43 +0200
Subject: [PATCH] fix issue 10017

---
 std/variant.d | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/std/variant.d b/std/variant.d
index 8c0cb4972..710279e0f 100644
--- a/std/variant.d
+++ b/std/variant.d
@@ -299,6 +299,12 @@ private:
         case OpID.copyOut:
             auto target = cast(VariantN *) parm;
             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))
                 || assert(false);
             target.fptr = &handler!(A);
@@ -1881,3 +1887,17 @@ unittest
     assert(a == b);
     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);
+}