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

Jump to bottom

Fix #7593: Crash in ScriptOrder::GetOrderDistance in VT_AIR mode #7605

Merged
merged 1 commit into from Jul 22, 2019
Merged

Fix #7593: Crash in ScriptOrder::GetOrderDistance in VT_AIR mode #7605

merged 1 commit into from Jul 22, 2019

Conversation

JGRennison
Copy link
Contributor

Null pointer dereference occurred when either origin_tile or dest_tile
were waypoint tiles.

LordAro
LordAro previously requested changes Jun 6, 2019
View reviewed changes
Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That if statement is getting a bit long, can you separate it into a couple of temporaries? origin_station & dest_station, probably

@LordAro LordAro force-pushed the get-order-distance-waypoint-fix branch from ba6b6c3 to 3bea58b Compare July 7, 2019 15:34
@LordAro LordAro dismissed their stale review July 7, 2019 15:37

fixed it myself

glx22
glx22 previously approved these changes Jul 7, 2019
View reviewed changes
@glx22 glx22 dismissed their stale review July 7, 2019 15:45

was too fast to click

@JGRennison @LordAro
Fix OpenTTD#7593: Crash in ScriptOrder::GetOrderDistance in VT_AIR mode
aa53935 
Null pointer dereference occurred when either origin_tile or dest_tile
were waypoint tiles.
@LordAro LordAro force-pushed the get-order-distance-waypoint-fix branch from 3bea58b to aa53935 Compare July 7, 2019 15:48
glx22
glx22 approved these changes Jul 7, 2019
View reviewed changes
Copy link
Contributor

@glx22 glx22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it should be correct :)

@LordAro LordAro merged commit d71a7c2 into OpenTTD:master Jul 22, 2019
@glx22 glx22 added the backport requested This PR should be backport to current release (RC / stable) label Oct 9, 2019
@LordAro LordAro removed the backport requested This PR should be backport to current release (RC / stable) label Feb 15, 2020
@JGRennison JGRennison deleted the get-order-distance-waypoint-fix branch January 9, 2024 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@glx22 glx22 glx22 approved these changes

@LordAro LordAro LordAro left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@JGRennison @glx22 @LordAro