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

DIRECTOR: return early where textCast is null #2226

Merged
merged 1 commit into from May 7, 2020

Conversation

@rvanlaar
Copy link
Contributor

rvanlaar commented May 7, 2020

Fixes a segfault for the rectangle not being valid and
resolves multiple test crashes in the buildbot.

Fixes a segfault for the rectangle not being valid and
resolves multiple test crashes in the buildbot.
@@ -857,6 +857,11 @@ void Frame::renderButton(Graphics::ManagedSurface &surface, uint16 spriteId) {

void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Common::Rect *textRect) {
TextCast *textCast = (TextCast*)_sprites[spriteId]->_cast;
if (textCast == nullptr){

This comment has been minimized.

Copy link
@sev-

sev- May 7, 2020

Member

This formatting is incorrect. I will merge it and then fix. But please, follow our code formatting conventions.

@sev- sev- merged commit 979bf50 into scummvm:master May 7, 2020
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
Codacy/PR Quality Review Up to standards. A positive pull request.
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

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