Merge pull request #4744 from 9rnsr/fix14699

Issue 14699 - ICE: segfaults on array with zero size
dlang · Jun 17, 2015 · 94a6afd · 94a6afd
2 parents 67b8271 + ae2cd8c
commit 94a6afd
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/src/mtype.c b/src/mtype.c
@@ -7870,7 +7870,7 @@ Expression *TypeStruct::defaultInitLiteral(Loc loc)
             error(loc, "circular reference to '%s'", vd->toPrettyChars());
             return new ErrorExp();
         }
-        if (vd->offset < offset)
+        if (vd->offset < offset || vd->type->size() == 0)
             e = NULL;
         else if (vd->init)
         {

diff --git a/src/struct.c b/src/struct.c
@@ -1221,7 +1221,11 @@ bool StructDeclaration::fill(Loc loc, Expressions *elements, bool ctorinit)
         if (elements && vx)
         {
             Expression *e;
-            if (vx->init)
+            if (vx->type->size() == 0)
+            {
+                e = NULL;
+            }
+            else if (vx->init)
             {
                 assert(!vx->init->isVoidInitializer());
                 e = vx->getConstInitializer(false);

diff --git a/src/todt.c b/src/todt.c
@@ -773,10 +773,15 @@ dt_t **Type_toDt(Type *t, dt_t **pdt)
 
 dt_t **toDtElem(TypeSArray *tsa, dt_t **pdt, Expression *e)
 {
-    //printf("TypeSArray::toDtElem()\n");
-    size_t len = tsa->dim->toInteger();
-    if (len)
+    //printf("TypeSArray::toDtElem() tsa = %s\n", tsa->toChars());
+    if (tsa->size(Loc()) == 0)
     {
+        pdt = dtnzeros(pdt, 0);
+    }
+    else
+    {
+        size_t len = tsa->dim->toInteger();
+        assert(len);
         pdt = dtend(pdt);
         Type *tnext = tsa->next;
         Type *tbn = tnext->toBasetype();

diff --git a/test/runnable/testdt.d b/test/runnable/testdt.d
@@ -73,6 +73,20 @@ void test13505()
     auto s = S13505();
 }
 
+/******************************************/
+// 14699
+
+struct S14699a { ubyte[0][10] values; }
+struct S14699b { S14699a tbl; }     
+// +/
+
+ubyte[0][1] sa14699;
+
+void test14699()
+{
+    //auto p = &sa14699;  // Cannot work in Win32 (OMF)
+}
+
 /******************************************/
 
 int main()