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 #9548, e5fedcd: [Squirrel] Crash during engine cleanup after reaching memory limit on realloc #9592

Merged
merged 1 commit into from Oct 2, 2021

Conversation

@glx22
Copy link
Contributor

@glx22 glx22 commented Oct 2, 2021

Motivation / Problem

When realloc() succeeds, original pointer is invalidated. If memory limit check throws an exception, squirrel doesn't receive the new pointer and all the cleanup is done on the old one.

Description

Replace realloc() with a malloc()-memcpy()-free() combo.
And adapt allocated_size calculation to be right in case of failure.

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')
LordAro
LordAro approved these changes Oct 2, 2021
@glx22 glx22 merged commit a53cfee into OpenTTD:master Oct 2, 2021
16 checks passed
Loading
@glx22 glx22 deleted the fix_9548 branch Oct 2, 2021
TrueBrain added a commit to TrueBrain/OpenTTD that referenced this issue Oct 3, 2021
TrueBrain added a commit to TrueBrain/OpenTTD that referenced this issue Oct 3, 2021
TrueBrain added a commit to TrueBrain/OpenTTD that referenced this issue Oct 3, 2021
TrueBrain added a commit to TrueBrain/OpenTTD that referenced this issue Oct 3, 2021
TrueBrain added a commit to TrueBrain/OpenTTD that referenced this issue Oct 3, 2021
TrueBrain added a commit that referenced this issue 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
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants