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

Fix #9562: Crash with invalid NewGRF #9564

Merged
merged 1 commit into from Sep 19, 2021
Merged

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Sep 19, 2021

Motivation / Problem

Since #9344, invalid NewGRFs could crash OpenTTD with a new spritegroup if both num_loading and num_loaded are zero.

Description

This is resolved by detecting this case and skipping creation of a sprite group.

Limitations

The invalid NewGRF may behave differently than before this (and #9344) however the NewGRF is still invalid, but it won't crash OpenTTD.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@LordAro LordAro merged commit 7e70ead into OpenTTD:master Sep 19, 2021
@PeterN PeterN deleted the fix-9562 branch September 20, 2021 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants