[1.8>1.9] [MERGE #4528 @leirocks] Fix bad assertion in DirectSetItemA…

…tRange for OP_MEMSET Merge pull request #4528 from leirocks:op_memset
chakra-core · Jan 16, 2018 · 79ef8ed · 79ef8ed
2 parents c6ae741 + a0d01ee
commit 79ef8ed
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/lib/Runtime/Library/JavascriptArray.inl b/lib/Runtime/Library/JavascriptArray.inl
@@ -1160,23 +1160,15 @@ SECOND_PASS:
         }
         else if (startIndex == 0 && length > this->length && (head == EmptySegment || length > head->size))
         {
-
             Recycler *recycler = GetRecycler();
-            this->length = length;
-            this->EnsureHead<T>();
-            SparseArraySegmentBase* current = nullptr;
-
-            Assert(head->size < length);
-
-            current = SparseArraySegment<T>::AllocateSegment(recycler, 0, length, (SparseArraySegment<T> *)nullptr);
+            SparseArraySegmentBase* current = SparseArraySegment<T>::AllocateSegment(recycler, 0, length, (SparseArraySegment<T> *)nullptr);
             this->SetHeadAndLastUsedSegment(current);
+            this->length = length;
 
             Assert(!HasSegmentMap());
 
             SetHasNoMissingValues(true);
-
             CopyValueToSegmentBuferNoCheck(((Js::SparseArraySegment<T>*)current)->elements, length, newValue);
-            this->SetLastUsedSegment(current);
         }
         else
         {