Skip to content

[Sim] guard malformed expression parsing #11460

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

[Sim] guard malformed expression parsing #11460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d7f6ee
[Player] guard pet.any expression parsing
Harmenszoon May 11, 2026
1b4d275
[Sim] guard missing actors 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
2 changes: 1 addition & 1 deletion engine/player/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12611,7 +12611,7 @@ std::unique_ptr<expr_t> player_t::create_expression( util::string_view expressio
// pet
if ( splits.size() >= 2 && splits[ 0 ] == "pet" )
{
if ( splits[ 1 ] == "any" && splits[ 2 ] == "active" )
if ( splits.size() == 3 && splits[ 1 ] == "any" && splits[ 2 ] == "active" )
{
return make_fn_expr( expression_str, [ this ]
{
Expand Down
2 changes: 1 addition & 1 deletion engine/sim/sim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3609,7 +3609,7 @@ std::unique_ptr<expr_t> sim_t::create_expression( util::string_view name_str )
if ( splits.size() >= 3 && splits[ 0 ] == "actors" )
{
player_t* actor = sim_t::find_player( splits[ 1 ] );
if ( !target )
if ( !actor )
return nullptr;

auto rest = std::string( splits[ 2 ] );
Expand Down
Loading