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 #6564: enforce types of arguments for station name strings #7419

Merged
merged 1 commit into from Mar 26, 2019

Conversation

@glx22
Copy link
Contributor

glx22 commented Mar 26, 2019

No description provided.

@LordAro

This comment has been minimized.

Copy link
Member

LordAro commented Mar 26, 2019

I guess this is a less general solution than what #7418 is (or will become) ?

@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented Mar 26, 2019

I think it may be a better solution than #7418 as here we know exactly what parameter types are expected. In #7418 it's a little bit vague.

@glx22

This comment has been minimized.

Copy link
Contributor Author

glx22 commented Mar 26, 2019

Yes it doesn't prevent incorrect newgrf strings, but at least it doesn't crash. Similar to 2f042ea

@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented Mar 26, 2019

Can the debug message reference string ID at all, perhaps mapped to the GRF-local ID?

@glx22

This comment has been minimized.

Copy link
Contributor Author

glx22 commented Mar 26, 2019

Hardly, GetInt64() knows nothing about the current string.

src/strings.cpp Outdated Show resolved Hide resolved
@glx22 glx22 force-pushed the glx22:fix6564 branch from 1fa267b to bdf0958 Mar 26, 2019
@PeterN
PeterN approved these changes Mar 26, 2019
@glx22 glx22 merged commit 427d9d4 into OpenTTD:master Mar 26, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190326.21 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:fix6564 branch Mar 26, 2019
@PeterN PeterN added backported and removed backport requested labels Apr 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.