clamp .gz/.zip data: don't read more than it said would be available

2005-01-10 01:01:34 +00:00
parent 8d40bee10c
commit cde599f33a
1 changed files with 6 additions and 0 deletions
@@ -83,6 +83,12 @@ RageFileObjInflate::~RageFileObjInflate()

 int RageFileObjInflate::ReadInternal( void *buf, size_t bytes )
 {
+	/* Don't read more than m_iUncompressedSize of data.  If we don't do this, it's
+	 * possible for a .gz to contain a header claiming 500k of data, but to actually
+	 * contain much more deflated data. */
+	ASSERT_M( m_iFilePos <= m_iUncompressedSize, ssprintf("%i, %i",m_iFilePos, m_iUncompressedSize) );
+	bytes = min( bytes, size_t(m_iUncompressedSize-m_iFilePos) );
+
 	bool done=false;
 	int ret = 0;
 	while( bytes && !done )