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 #7553: validate the number of allocated strings #7554

Merged
merged 1 commit into from May 1, 2019
Merged

Conversation

@glx22
Copy link
Contributor

glx22 commented Apr 30, 2019

Prevents the crash, but the error is not reported in script debug window.

Also based on

static const uint TAB_SIZE_GAMESCRIPT = TAB_SIZE * 32;
introduced in 2bb80d2, I think
StringData data(1);
should be StringData data(32);

@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented May 1, 2019

My fix was... shorter (and therefore probably incomplete), but still does not show as an error in the script debug window. PeterN@d267637

@glx22 glx22 force-pushed the glx22:fix7553 branch from 0f4e85a to edc8f83 May 1, 2019
@PeterN
PeterN approved these changes May 1, 2019
@glx22 glx22 merged commit cef9a76 into OpenTTD:master May 1, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190501.3 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.8) Linux linux-amd64-clang-3.8 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:fix7553 branch May 1, 2019
PeterN added a commit to PeterN/OpenTTD that referenced this pull request May 2, 2019
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

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