Require ordered list of subassemblies

Author: r0qs

libevmasm/Assembly.cpp

@@ -565,6 +565,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 	{
 		solRequire(_json[".data"].isObject(), AssemblyImportException, "Optional member '.data' is not an object.");
 		Json::Value const& data = _json[".data"];
+		size_t subId{};
 		for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)
 		{
 			solAssert(dataIter.key().isString());
@@ -598,13 +599,13 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 				{
 					solThrow(AssemblyImportException, "The key '" + dataItemID + "' inside '.data' is out of the supported integer range.");
 				}
+				solRequire(subId == index, AssemblyImportException, "Invalid order of keys in '.data'. Expect key '" + std::to_string(subId) + "' but got '" + dataItemID + "'.");
 
-				if (result->m_subs.size() <= index)
-					result->m_subs.resize(index + 1);
 				auto [subassembly, emptySourceList] = Assembly::fromJSON(dataItem, _level == 0 ? parsedSourceList : _sourceList, _level + 1);
 				solAssert(subassembly);
 				solAssert(emptySourceList.empty());
-				result->m_subs[index] = subassembly;
+				result->m_subs.emplace_back(subassembly);
+				subId++;
 			}
 			else
 				solThrow(AssemblyImportException, "The value of key '" + dataItemID + "' inside '.data' is neither a hex string nor an object.");