[Freepv-cvs] SF.net SVN: freepv:[156] freepv/trunk/src/libfreepv/QTVRDecoder.cpp

[<bru...@us...>]

Revision: 156
          http://freepv.svn.sourceforge.net/freepv/?rev=156&view=rev
Author:   brunopostle
Date:     2009-02-22 10:59:11 +0000 (Sun, 22 Feb 2009)

Log Message:
-----------
Don't read past EOF patch #2225655 (Tom Sharpless)
(merged from branch_leonox)

Modified Paths:
--------------
    freepv/trunk/src/libfreepv/QTVRDecoder.cpp

Modified: freepv/trunk/src/libfreepv/QTVRDecoder.cpp
===================================================================
--- freepv/trunk/src/libfreepv/QTVRDecoder.cpp	2009-02-22 10:56:20 UTC (rev 155)
+++ freepv/trunk/src/libfreepv/QTVRDecoder.cpp	2009-02-22 10:59:11 UTC (rev 156)
@@ -280,6 +280,11 @@
 	}
     m_mainFile = gFile;
 
+  // get file size for EOF test
+	size_t filepos = ftell( gFile );
+	fseek( gFile, 0, SEEK_END );
+	size_t filesize = ftell( gFile );
+	fseek( gFile, filepos, SEEK_SET );
 
 		/*************************/
 		/* RECURSE THROUGH ATOMS */
@@ -287,7 +292,8 @@
 	do
 	{
 		atomSize = ReadMovieAtom();
-	}while(atomSize > 0);
+	}while(atomSize > 0
+		   && ftell( gFile ) < filesize );
 
     if (m_error != "") {
         return false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.