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 glx22 commented Mar 26, 2019

No description provided.

@LordAro
Copy link
Member

LordAro commented Mar 26, 2019

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

@PeterN
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
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
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
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 merged commit 427d9d4 into OpenTTD:master Mar 26, 2019
@glx22 glx22 deleted the fix6564 branch March 26, 2019 21:51
@planetmaker planetmaker added the backport requested This PR should be backport to current release (RC / stable) label Apr 6, 2019
@PeterN PeterN 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 Apr 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants