From 983237d9122a3f1eec2f18d2b9fc499c76c400ed Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 7 Mar 2017 07:51:11 +0100
Subject: DIRECTOR: Added sanity check to Score::getSpriteById()

---
 engines/director/score.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 0d0be21f10..112e4b2fcb 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1050,6 +1050,10 @@ void Score::processEvents() {
 }
 
 Sprite *Score::getSpriteById(uint16 id) {
+	if (_currentFrame >= _frames.size() || _currentFrame < 0 || id >= _frames[_currentFrame]->_sprites.size()) {
+		warning("Score::getSpriteById(%d): out of bounds. frame: %d", id, _currentFrame);
+		return nullptr;
+	}
 	if (_frames[_currentFrame]->_sprites[id]) {
 		return _frames[_currentFrame]->_sprites[id];
 	} else {
-- 
cgit v1.2.3