Fix client crash on invalid setTrainTrack track number#5049
Open
HeresHavi wants to merge 1 commit into
Open
Conversation
Throw invalid train track errors by value so the Lua function parser can handle them instead of terminating the client.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Changed
setTrainTrackto throwstd::invalid_argumentby value.Invalid track numbers are now caught by the existing Lua function parser and returned as a normal Lua error instead of terminating the client.
Motivation
setTrainTrackpreviously usedthrow new std::invalid_argument(...), which throws a pointer to an exception. The Lua function parser catchesstd::logic_error&, so the pointer escaped the handler and became a fatal C++ exception.For example, a train resource might read the track number from a route configuration. If that value is
4instead of the valid range from0through3, callingsetTrainTrackcould crash the player's client.Throwing the exception object by value lets the existing handler report the invalid argument normally.
Crash Stack
Test plan
Runtime
537.setTrainTrack(train, 0)returnedcall=true result=truebefore and after the fix.setTrainTrack(train, 4)caused a fatal C++ exception inCLuaVehicleDefs::SetTrainTrack.call=false result=Invalid track number range (0-3), and the client stayed open.Builds and Tests
Debug | Win32: Full build passed, 304 client tests passed.Release | Win32: Full build passed, 304 client tests passed.Debug | x64: Full build passed.Release | x64: Full build passed.clang-format.Checklist