1914+3198

1914 Array initialisation from const array yields memory trample 3198 wrong initializer for structs arrays This is the actual compiler change. (Wasn't included in the previous commit due to my inexperience with Git).
dlang · Jan 27, 2011 · 0c7bd71 · 0c7bd71
1 parent bf1d0d9
commit 0c7bd71
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/todt.c b/src/todt.c
@@ -985,7 +985,7 @@ dt_t **TypeSArray::toDtElem(dt_t **pdt, Expression *e)
             pdt = &((*pdt)->DTnext);
         Type *tnext = next;
         Type *tbn = tnext->toBasetype();
-        while (tbn->ty == Tsarray)
+        while (tbn->ty == Tsarray && (!e || tbn != e->type->nextOf()))
         {   TypeSArray *tsa = (TypeSArray *)tbn;
 
             len *= tsa->dim->toInteger();
@@ -994,11 +994,12 @@ dt_t **TypeSArray::toDtElem(dt_t **pdt, Expression *e)
         }
         if (!e)                         // if not already supplied
             e = tnext->defaultInit();   // use default initializer
-        if (tbn->ty == Tstruct)
-            tnext->toDt(pdt);
-        else
-            e->toDt(pdt);
+        e->toDt(pdt);
         dt_optimize(*pdt);
+        if (e->op == TOKstring)
+            len /= ((StringExp *)e)->len;
+        if (e->op == TOKarrayliteral)
+            len /= ((ArrayLiteralExp *)e)->elements->dim;
         if ((*pdt)->dt == DT_azeros && !(*pdt)->DTnext)
         {
             (*pdt)->DTazeros *= len;
@@ -1010,7 +1011,7 @@ dt_t **TypeSArray::toDtElem(dt_t **pdt, Expression *e)
             (*pdt)->DTazeros = len;
             pdt = &((*pdt)->DTnext);
         }
-        else if (e->op != TOKstring && e->op != TOKarrayliteral)
+        else
         {
             for (i = 1; i < len; i++)
             {