Skip to content

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

Merged
LordAro merged 1 commit into
OpenTTD:masterfrom
JGRennison:get-order-distance-waypoint-fix
Jul 22, 2019
Merged

LordAro merged 1 commit into
OpenTTD:masterfrom
JGRennison:get-order-distance-waypoint-fix

Conversation

@JGRennison

Copy link
Copy Markdown
Contributor

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

LordAro
LordAro previously requested changes Jun 6, 2019

@LordAro LordAro left a comment

Copy link
Copy Markdown
Member

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
Comment thread src/script/api/script_order.cpp Resolved
@glx22
glx22 dismissed their stale review July 7, 2019 15:45

was too fast to click

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 left a comment

Copy link
Copy Markdown
Contributor

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants