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

BLADERUNNER: Ensure the Color256 struct is correctly packed #1838

Merged
merged 1 commit into from Sep 11, 2019

Conversation

@ccawley2011
Copy link
Member

commented Sep 11, 2019

This fixes a crash on RISC OS due to the size of the structure being padded to a multiple of 4 bytes, and ScreenEffects::readVqa() assuming the structure size is 3 when reading the palette data.

@peterkohaut peterkohaut merged commit 5413e89 into scummvm:master Sep 11, 2019

2 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ccawley2011 ccawley2011 deleted the ccawley2011:bladerunner-struct-pack branch Sep 11, 2019

@sev-

This comment has been minimized.

Copy link
Member

commented Sep 11, 2019

Well, this should be in fact fixed by properly reading the original data. Instead of stream->read(&entry->palette, sizeof(Color256) * 16); a loop should be used. Otherwise, it is not portable.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.