From 9604e9973643a15d236dbf1f0ca5c470aaabd157 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Wed, 13 May 2009 23:08:36 +0000
Subject: SCI: Fixes a crash when loading SCI1.1 views without palette.

svn-id: r40545
---
 engines/sci/gfx/res_view1.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/gfx/res_view1.cpp b/engines/sci/gfx/res_view1.cpp
index 2b0c7439a1..b53702601b 100644
--- a/engines/sci/gfx/res_view1.cpp
+++ b/engines/sci/gfx/res_view1.cpp
@@ -376,8 +376,13 @@ gfxr_view_t *gfxr_draw_view11(int id, byte *resource, int size) {
 	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++) {
-- 
cgit v1.2.3