Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CINE: FW: Fix Roland MT-32 sample playing. #2394

Merged
merged 1 commit into from Aug 1, 2020
Merged

Conversation

@karisal
Copy link
Contributor

karisal commented Jul 31, 2020

Fix bug #11547 ("CINE: FW: Game crashes during intro with MT-32 music").
Future Wars PC disassembly passes 256 to writeInstrument and
writeInstrument overwrites it with value 246 here. So the value
becomes 246 in the end.

Fix bug #11547 ("CINE: FW: Game crashes during intro with MT-32 music").
Future Wars PC disassembly passes 256 to writeInstrument and
writeInstrument overwrites it with value 246 here. So the value
becomes 246 in the end.
@karisal
Copy link
Contributor Author

karisal commented Jul 31, 2020

@eriktorbjorn Here's a fix for the bug you reported.

@eriktorbjorn
Copy link
Member

eriktorbjorn commented Aug 1, 2020

That fixes the crash for me. (Not surprising, since it no longer has any way that I can see of writing outside the buffer on this code path, but I thought I'd confirm it anyway.)

@sev-
Copy link
Member

sev- commented Aug 1, 2020

Thanks

@sev- sev- merged commit 8c34f86 into scummvm:master Aug 1, 2020
2 of 5 checks passed
2 of 5 checks passed
Windows (win32, x86-windows, x86, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 flui... Windows (win32, x86-windows, x86, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 flui...
Details
Windows (x64, x64, x64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 fluids... Windows (x64, x64, x64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 fluids...
Details
Windows (arm64, arm64, arm64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 ... Windows (arm64, arm64, arm64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 ...
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deepcode-ci-bot Well done, no issues found!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.