From 6eeebfb19125b79e4a77e8c35a0d04cf1a5d97bd Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 4 Apr 2011 09:56:50 +0200
Subject: SCUMM: Check for cutSceneStackPointer underflows

---
 engines/scumm/script.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index eac2061560..a76461f579 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1283,7 +1283,8 @@ void ScummEngine::beginCutscene(int *args) {
 	int scr = _currentScript;
 	vm.slot[scr].cutsceneOverride++;
 
-	if (++vm.cutSceneStackPointer > ARRAYSIZE(vm.cutSceneData))
+	++vm.cutSceneStackPointer;
+	if (vm.cutSceneStackPointer > ARRAYSIZE(vm.cutSceneData))
 		error("Cutscene stack overflow");
 
 	vm.cutSceneData[vm.cutSceneStackPointer] = args[0];
@@ -1313,6 +1314,9 @@ void ScummEngine::endCutscene() {
 
 	vm.cutSceneScript[vm.cutSceneStackPointer] = 0;
 	vm.cutScenePtr[vm.cutSceneStackPointer] = 0;
+
+	if (0 == vm.cutSceneStackPointer)
+		error("Cutscene stack underflow");
 	vm.cutSceneStackPointer--;
 
 	if (VAR(VAR_CUTSCENE_END_SCRIPT))
-- 
cgit v1.2.3