Merge remote-tracking branch 'remotes/origin/master' into testnet

Author: anatolse

utility/common.cpp

@@ -430,6 +430,12 @@ namespace std
 		throw runtime_error("not impl");
 	}
 
+	void FStream::ensure_size(size_t s)
+	{
+		if (s > m_Remaining)
+			throw runtime_error("underflow");
+	}
+
 	size_t FStream::read(void* pPtr, size_t nSize)
 	{
 		m_F.read((char*)pPtr, nSize);

utility/common.h

@@ -269,6 +269,7 @@ namespace std
 		void Seek(uint64_t);
 		uint64_t Tell();
 
+		void ensure_size(size_t s);
 		// read/write always return the size requested. Exception is thrown if underflow or error
 		size_t read(void* pPtr, size_t nSize);
 		size_t write(const void* pPtr, size_t nSize);