Skip to content

[Player] guard malformed time_to expression parsing #11462

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.

Sign up for GitHub

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

Open
Harmenszoon wants to merge 2 commits into
base: midnight
Choose a base branch
from
Open

[Player] guard malformed time_to expression parsing #11462

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
285903e
[Player] guard malformed time_to expressions
Harmenszoon May 11, 2026
171e565
[Player] guard malformed resource time_to expressions
Harmenszoon May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions engine/player/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12072,6 +12072,11 @@ std::unique_ptr<expr_t> player_t::create_expression( util::string_view expressio
auto parts = util::string_split<util::string_view>( expression_str, "_" );
double percent = -1.0;

if ( parts.size() < 3 )
{
throw sc_invalid_apl_argument( fmt::format( "Invalid 'time_to_' expression '{}'.", expression_str ) );
}

if ( util::str_in_str_ci( parts[ 2 ], "die" ) )
{
percent = 0.0;
Expand Down Expand Up @@ -12828,6 +12833,11 @@ std::unique_ptr<expr_t> player_t::create_resource_expression( util::string_view
{
auto parts = util::string_split<util::string_view>( splits[ 1 ], "_" );

if ( parts.size() < 3 )
{
throw sc_invalid_apl_argument( fmt::format( "Invalid resource expression '{}'.", expression_str ) );
}

// foo.time_to_max
if ( util::str_in_str_ci( parts[ 2 ], "max" ) )
{
Expand Down
Loading