[Scummvm-git-logs] scummvm master -> 0c26da90bb7538fb8bbf866013993185467b194b

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0c26da90bb SCI32: Fix segfault when SCI3 vocab isn't found


Commit: 0c26da90bb7538fb8bbf866013993185467b194b
    https://github.com/scummvm/scummvm/commit/0c26da90bb7538fb8bbf866013993185467b194b
Author: Dan Church (amphetamachine at gmail.com)
Date: 2018-01-02T12:57:59-06:00

Commit Message:
SCI32: Fix segfault when SCI3 vocab isn't found

Seen when attempting to detect and/or run the Shivers 2 demo.

Closes gh-1106.

Changed paths:
    engines/sci/resource.cpp


diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index eb786bc..78b641c 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -2918,6 +2918,9 @@ Common::String ResourceManager::findSierraGameId(const bool isBE) {
 		heap = findResource(ResourceId(kResourceTypeScript, 0), false);
 
 		Resource *vocab = findResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SELECTORS), false);
+		if (!vocab)
+			return "";
+
 		const uint16 numSelectors = isBE ? vocab->getUint16BEAt(0) : vocab->getUint16LEAt(0);
 		for (uint16 i = 0; i < numSelectors; ++i) {
 			uint16 selectorOffset;