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.

Sign up for GitHub

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

Jump to bottom

Fix #9626, ddafc0d: Incorrect loading of script saved data #9629

Merged
merged 1 commit into from Oct 20, 2021
Merged

Fix #9626, ddafc0d: Incorrect loading of script saved data #9629

merged 1 commit into from Oct 20, 2021

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Oct 19, 2021

Motivation / Problem

Since #9415, integers for scripts are saved as 64bit, and a conversion is in place to load 32bit value from old saves.
But this conversion is incorrect, upper 32bit part of the 64bit value is not properly initialised and can contain garbage.

Description

Simply read a 32 bit value and properly store it in a 64bit variable.

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

@glx22 glx22 added the backport requested This PR should be backport to current release (RC / stable) label Oct 20, 2021
@glx22 glx22 merged commit eed49d7 into OpenTTD:master Oct 20, 2021
@glx22 glx22 deleted the fix_9626 branch October 20, 2021 10:23
TrueBrain pushed a commit to TrueBrain/OpenTTD that referenced this pull request Oct 23, 2021
@glx22 @TrueBrain
Fix OpenTTD#9626, ddafc0d: Incorrect loading of script saved data (Op…
4a8a1b7 
…enTTD#9629)
@TrueBrain TrueBrain mentioned this pull request Oct 23, 2021
Merged
TrueBrain pushed a commit that referenced this pull request Oct 23, 2021
@glx22 @TrueBrain
Fix #9626, ddafc0d: Incorrect loading of script saved data (#9629)
a652ea2
@TrueBrain TrueBrain added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Oct 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TrueBrain TrueBrain TrueBrain approved these changes

Assignees
No one assigned
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@glx22 @TrueBrain