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 f6d5c01: Delay deletion when closing windows #9274

Merged
merged 2 commits into from May 29, 2021

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented May 15, 2021

Motivation / Problem

Since f6d5c01, windows' deletion is immediate.
ProcessScheduledInvalidations() can do invalid reads if window is self deleted during OnInvalidateData().
And probably other invalid accesses are yet to be found.

Description

Replace delete this used in Window event handlers, with this->Close() which hides the window, but delay the real deletion so it happens in a safe place.

Limitations

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

src/window.cpp Outdated Show resolved Hide resolved
rubidium42
rubidium42 previously approved these changes May 24, 2021
src/error_gui.cpp Outdated Show resolved Hide resolved
@glx22 glx22 changed the title Fix f6d5c01: Delay deletion for self closing windows Fix f6d5c01: Delay deletion when closing windows May 29, 2021
@glx22 glx22 merged commit 5799402 into OpenTTD:master May 29, 2021
@glx22 glx22 deleted the self_close branch May 29, 2021 19:08
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