Fixed an edge case where an array that didn't have a large enough all…

…ocation was incorrectly being treated as if it did.
dlang · Jan 13, 2015 · df15742 · df15742
1 parent 3c83c5c
commit df15742
Showing 1 changed file with 32 additions and 7 deletions.
diff --git a/src/rt/lifetime.d b/src/rt/lifetime.d
@@ -218,17 +218,17 @@ private class ArrayAllocLengthLock
   */
 bool __setArrayAllocLength(ref BlkInfo info, size_t newlength, bool isshared, const TypeInfo ti, size_t oldlength = ~0) pure nothrow
 {
-    bool needToSetTypeInfo = false;
+    size_t typeInfoSize = 0;
     if (auto si = cast(const TypeInfo_Struct)ti.next)
     {
         if (si.xdtor)
         {
-            needToSetTypeInfo = true;
+            typeInfoSize = size_t.sizeof;
         }
     }
     if(info.size <= 256)
     {
-        if(newlength + SMALLPAD > info.size)
+        if(newlength + SMALLPAD + typeInfoSize > info.size)
             // new size does not fit inside block
             return false;
         auto length = cast(ubyte *)(info.base + info.size - SMALLPAD);
@@ -259,15 +259,15 @@ bool __setArrayAllocLength(ref BlkInfo info, size_t newlength, bool isshared, co
             // setting the initial length, no lock needed
             *length = cast(ubyte)newlength;
         }
-        if (needToSetTypeInfo)
+        if (typeInfoSize)
         {
             auto typeInfo = cast(TypeInfo_Struct*)(info.base + info.size - SMALLPAD - size_t.sizeof);
             *typeInfo = cast(TypeInfo_Struct)ti.next;
         }
     }
     else if(info.size < PAGESIZE)
     {
-        if(newlength + MEDPAD > info.size)
+        if(newlength + MEDPAD + typeInfoSize > info.size)
             // new size does not fit inside block
             return false;
         auto length = cast(ushort *)(info.base + info.size - MEDPAD);
@@ -298,7 +298,7 @@ bool __setArrayAllocLength(ref BlkInfo info, size_t newlength, bool isshared, co
             // setting the initial length, no lock needed
             *length = cast(ushort)newlength;
         }
-        if (needToSetTypeInfo)
+        if (typeInfoSize)
         {
             auto typeInfo = cast(TypeInfo_Struct*)(info.base + info.size - MEDPAD - size_t.sizeof);
             *typeInfo = cast(TypeInfo_Struct)ti.next;
@@ -337,7 +337,7 @@ bool __setArrayAllocLength(ref BlkInfo info, size_t newlength, bool isshared, co
             // setting the initial length, no lock needed
             *length = newlength;
         }
-        if (needToSetTypeInfo)
+        if (typeInfoSize)
         {
             auto typeInfo = cast(TypeInfo_Struct*)(info.base + size_t.sizeof);
             *typeInfo = cast(TypeInfo_Struct)ti.next;
@@ -698,11 +698,21 @@ Lcontinue:
         {
             curallocsize = *(cast(ubyte *)(info.base + info.size - SMALLPAD));
             arraypad = SMALLPAD;
+            if (auto si = cast(const TypeInfo_Struct)ti.next)
+            {
+                if (si.xdtor)
+                    arraypad += size_t.sizeof;
+            }
         }
         else if(info.size < PAGESIZE)
         {
             curallocsize = *(cast(ushort *)(info.base + info.size - MEDPAD));
             arraypad = MEDPAD;
+            if (auto si = cast(const TypeInfo_Struct)ti.next)
+            {
+                if (si.xdtor)
+                    arraypad += size_t.sizeof;
+            }
         }
         else
         {
@@ -789,12 +799,27 @@ Lcontinue:
     // assumes you are not counting the pad size, and info.size does include
     // the pad.
     if(info.size <= 256)
+    {
         arraypad = SMALLPAD;
+        if (auto si = cast(const TypeInfo_Struct)ti.next)
+        {
+            if (si.xdtor)
+                arraypad += size_t.sizeof;
+        }
+    }
     else if(info.size < PAGESIZE)
+    {
         arraypad = MEDPAD;
+        if (auto si = cast(const TypeInfo_Struct)ti.next)
+        {
+            if (si.xdtor)
+                arraypad += size_t.sizeof;
+        }
+    }
     else
         arraypad = LARGEPAD;
 
+
     curcapacity = info.size - arraypad;
     return curcapacity / size;
 }