Skip to content

Fix #9353: [Script] Garbage collecting on priority queues could crash the game - #9356

Merged
rubidium42 merged 1 commit into
OpenTTD:masterfrom
rubidium42:issue-9353
Jun 12, 2021
Merged

rubidium42 merged 1 commit into
OpenTTD:masterfrom
rubidium42:issue-9353

Conversation

@rubidium42

Copy link
Copy Markdown
Contributor

Motivation / Problem

Fixes #9353.

Description

The desctructor of ScriptPriorityQueue depends on ActiveInstance being in scope. For the garbage collection this was not the case, so add it to the garbage collection too just like for the game loop and others.

Limitations

None

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 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')

@rubidium42 rubidium42 added the backport requested This PR should be backport to current release (RC / stable) label Jun 12, 2021
@rubidium42
rubidium42 merged commit 71f3c35 into OpenTTD:master Jun 12, 2021
@rubidium42
rubidium42 deleted the issue-9353 branch June 12, 2021 17:58
@TrueBrain TrueBrain removed the backport requested This PR should be backport to current release (RC / stable) label Oct 3, 2021
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.

Crash Report

3 participants