[Scummvm-cvs-logs] SF.net SVN: scummvm:[42286] scummvm/trunk/graphics/video/coktelvideo/ coktelvideo.cpp

[drmccoy at users.sourceforge.net]

Revision: 42286
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42286&view=rev
Author:   drmccoy
Date:     2009-07-09 09:39:51 +0000 (Thu, 09 Jul 2009)

Log Message:
-----------
Warn instead of crash when a video frame part was found although the header says there's no video

Modified Paths:
--------------
    scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp

Modified: scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2009-07-09 09:21:57 UTC (rev 42285)
+++ scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2009-07-09 09:39:51 UTC (rev 42286)
@@ -1324,7 +1324,9 @@
 				_stream->skip(part.size);
 			}
 
-		} else if (part.type == kPartTypeVideo) {
+		} else if ((part.type == kPartTypeVideo) && !_hasVideo) {
+			warning("Header claims there's no video, but video frame part found");
+		} else if ((part.type == kPartTypeVideo) && _hasVideo) {
 			state.flags &= ~kStateNoVideoData;
 
 			uint32 size = part.size;


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