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 #7969: limit recursion during alias execution #7973

Merged
merged 1 commit into from Feb 4, 2020
Merged

Conversation

@glx22
Copy link
Contributor

glx22 commented Feb 4, 2020

No description provided.

Copy link
Contributor

nielsmh left a comment

Exactly how I'd have done it.
Should maybe have the max recursion as a named constant but eh, can do that some other time if someone really feels for it.

@glx22 glx22 force-pushed the glx22:fix_7969 branch from 9d68b16 to ae7bea3 Feb 4, 2020
@glx22
Copy link
Contributor Author

glx22 commented Feb 4, 2020

Added the constant and updated variable type.

@nielsmh
nielsmh approved these changes Feb 4, 2020
@glx22 glx22 merged commit b5d5655 into OpenTTD:master Feb 4, 2020
8 checks passed
8 checks passed
Commit checker
Details
OpenTTD CI Build #20200204.2 succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.9) Linux linux-amd64-clang-3.9 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
@glx22 glx22 deleted the glx22:fix_7969 branch Feb 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.