GLK: ADVSYS: Fix "crash" when matching with empty nouns array #6173
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes the case for "Starship Columbus" IF game This game seems to call VM::opMATCH() multiple times per line, and very often would cause an assertion fault for out of bounds access to an array (_nouns). Inputs like "open", "inventory","help" would trigger the assertion fault. Debugging shows that in those cases, the idx var in opMATCH would be "-1" and also the _nouns array would be empty. I've added a check for either in an if clause that essentially fails the match and prevents the out of bounds array access attempt. The issue was first reported on the forums here: https://forums.scummvm.org/viewtopic.php?p=99929&sid=1d010aa5065115367a5dc3a2c4236434#p99929
|
It's quite odd that the game is exhibiting this bug - that part is the same as the original advsys code: So, perhaps there's another underlying issue here, with out implementation? In any case, a sanity check like this is fine, but we need to figure out if there's an issue with our implementation |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the case for "Starship Columbus" IF game
This game seems to call VM::opMATCH() multiple times per line, and very often would cause an assertion fault for out of bounds access to an array (_nouns). Inputs like "open", "inventory","help" would trigger the assertion fault. Debugging shows that in those cases, the idx var in opMATCH would be "-1" and also the _nouns array would be empty. I've added a check for either in an if clause that essentially fails the match and prevents the out of bounds array access attempt.
The issue was first reported on the forums here: https://forums.scummvm.org/viewtopic.php?p=99929&sid=1d010aa5065115367a5dc3a2c4236434#p99929