Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix test failures on Windows

Browse Source 
This was SVN commit r10802.
This commit is contained in:
Ykkrosh 2011-12-23 13:37:11 +00:00
parent 4f6f0b7baf
commit 1f38526444
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/simulation2/serialization/IDeserializer.h
View File

@ -79,8 +79,11 @@ public:
virtual std::istream& GetStream() = 0;
/**
* Throws an exception if the stream cannot provide the required number of
* bytes. (This should be used when allocating memory based on data in the
* Throws an exception if the stream definitely cannot provide the required
* number of bytes.
* (It might be conservative and *not* throw an exception in some cases where
* the stream actually can't provide the required bytes.)
* (This should be used when allocating memory based on data in the
* stream, e.g. reading strings, to avoid dangerously large allocations
* when the data is invalid.)
*/

10
source/simulation2/serialization/StdDeserializer.cpp
View File

@ -69,7 +69,15 @@ std::istream& CStdDeserializer::GetStream()
void CStdDeserializer::RequireBytesInStream(size_t numBytes)
{
if (numBytes > (size_t)m_Stream.rdbuf()->in_avail())
// It would be nice to do:
// if (numBytes > (size_t)m_Stream.rdbuf()->in_avail())
// throw PSERROR_Deserialize_OutOfBounds("RequireBytesInStream");
// but that doesn't work (at least on MSVC) since in_avail isn't
// guaranteed to return the actual number of bytes available; see e.g.
// http://social.msdn.microsoft.com/Forums/en/vclanguage/thread/13009a88-933f-4be7-bf3d-150e425e66a6#70ea562d-8605-4742-8851-1bae431ce6ce
// Instead we'll just verify that it's not an extremely large number:
if (numBytes > 64*MiB)
throw PSERROR_Deserialize_OutOfBounds("RequireBytesInStream");
}