libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 01:46:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCI: Fix errorString when execution stack isn't initialized

Browse Source
This commit is contained in:
sluicebox 2023-11-07 20:47:31 -07:00
parent 5cc1ac3a98
commit cb233df64d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/sci/sci.cpp
View File

@ -718,7 +718,17 @@ void SciEngine::runGame() {
// When the SCI engine enters an error state, this block will add additional VM engine context for error reporting
void SciEngine::errorString(const char *buf_input, char *buf_output, int buf_output_size) {
EngineState *s = _gamestate;
Script *activeScript = (s && s->_segMan) ? s->_segMan->getScriptIfLoaded(s->xs->addr.pc.getSegment()) : nullptr;
Script *activeScript = nullptr;
if (s != nullptr) {
// EngineState::xs is only valid if it points to an item in the execution stack.
Common::List<ExecStack>::const_iterator it;
for (it = s->_executionStack.begin(); it != s->_executionStack.end(); ++it) {
if (&(*it) == s->xs) {
activeScript = s->_segMan->getScriptIfLoaded(s->xs->addr.pc.getSegment());
break;
}
}
}
Kernel *kernel = g_sci ? g_sci->getKernel() : nullptr;
// If a script is actively loaded at the time of error.