[Scummvm-cvs-logs] SF.net SVN: scummvm:[40545] scummvm/trunk/engines/sci/gfx/res_view1.cpp

[waltervn at users.sourceforge.net]

Revision: 40545
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40545&view=rev
Author:   waltervn
Date:     2009-05-13 23:08:36 +0000 (Wed, 13 May 2009)

Log Message:
-----------
SCI: Fixes a crash when loading SCI1.1 views without palette.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/res_view1.cpp

Modified: scummvm/trunk/engines/sci/gfx/res_view1.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/res_view1.cpp	2009-05-13 23:06:16 UTC (rev 40544)
+++ scummvm/trunk/engines/sci/gfx/res_view1.cpp	2009-05-13 23:08:36 UTC (rev 40545)
@@ -376,8 +376,13 @@
 	view->loops_nr = loops_num;
 	view->loops = (gfxr_loop_t *)calloc(view->loops_nr, sizeof(gfxr_loop_t));
 
-	// There is no indication of size here, but this is certainly large enough
-	view->palette = gfxr_read_pal11(id, resource + palette_offset, 1284);
+	if (palette_offset > 0) {
+		// There is no indication of size here, but this is certainly large enough
+		view->palette = gfxr_read_pal11(id, resource + palette_offset, 1284);
+	} else {
+		// View has no palette
+		view->palette = NULL;
+	}
 
 	seeker = resource + header_size;
 	for (i = 0; i < view->loops_nr; i++) {


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