Merge remote-tracking branch 'origin/develop' into HEAD

This commit is contained in:
chriseth
2019-10-28 12:12:52 +01:00
22 changed files with 334 additions and 277 deletions
+1 -1
View File
@@ -1861,7 +1861,7 @@ u256 ArrayType::memoryDataSize() const
solAssert(m_location == DataLocation::Memory, "");
solAssert(!isByteArray(), "");
bigint size = bigint(m_length) * m_baseType->memoryHeadSize();
solAssert(size <= numeric_limits<unsigned>::max(), "Array size does not fit u256.");
solAssert(size <= numeric_limits<u256>::max(), "Array size does not fit u256.");
return u256(size);
}