Fix UB with Japas jam session#863
Merged
louist103 merged 1 commit intoHarbourMasters:develop-satokofrom Nov 16, 2024
Merged
Conversation
4 tasks
garrettjoecox
approved these changes
Nov 16, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes an issue where the Japas jam session could not be performed on Linux due to UB with an expression that starts the ocarina song section. This expression was left shifting by 83, which can't fit in a u32. On some platforms this would roll over to 19 (83-32-32), but linux would get some other value, which lead to the ocarina flags not being set with the proper prompt.
Reworking this expression to be similar to the surrounding code prevents the UB while maintaining rom matching for decomp. Submitted a PR upstream for this.
Fixes #680
Build Artifacts