From 5f3f21e20ed86f4056544dbb5c3fcd471e20b377 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 6 Oct 2012 10:21:57 +0200
Subject: SCI: Fix some console output formatting

---
 engines/sci/engine/scriptdebug.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/engine/scriptdebug.cpp')

diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index d3abb9ff41..5594c0461c 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -514,7 +514,7 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) {
 
 		if (!objType) {
 			debugN("End of script object (#0) encountered.\n");
-			debugN("Classes: %i, Objects: %i, Export: %i,\n Var: %i (all base 10)",
+			debugN("Classes: %i, Objects: %i, Export: %i,\n Var: %i (all base 10)\n",
 			          objectctr[6], objectctr[1], objectctr[7], objectctr[10]);
 			return;
 		}
-- 
cgit v1.2.3


From e38d4f20e8251937fd582e1ebb17568144a41e92 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 6 Oct 2012 10:22:08 +0200
Subject: SCI: Fix dissect_script crash with invalid object types

---
 engines/sci/engine/scriptdebug.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/sci/engine/scriptdebug.cpp')

diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 5594c0461c..b2f22aa985 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -527,7 +527,8 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) {
 
 		_seeker += objsize;
 
-		objectctr[objType]++;
+		if (objType >= 0 && objType < ARRAYSIZE(objectctr))
+			objectctr[objType]++;
 
 		switch (objType) {
 		case SCI_OBJ_OBJECT:
-- 
cgit v1.2.3