Skip to content

[Vengeance] Fix pick_up_fragment use-after-free crash #11184

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
taherbert wants to merge 1 commit into
base: midnight
Choose a base branch
from
Open

[Vengeance] Fix pick_up_fragment use-after-free crash #11184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions engine/class_modules/sc_demon_hunter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4998,11 +4998,11 @@ struct pick_up_fragment_t : public demon_hunter_spell_t
struct pick_up_event_t : public event_t
{
demon_hunter_t* dh;
soul_fragment_t* frag;
soul_fragment type;
expr_t* expr;

pick_up_event_t( soul_fragment_t* f, timespan_t time, expr_t* e )
: event_t( *f->dh, time ), dh( f->dh ), frag( f ), expr( e )
pick_up_event_t( demon_hunter_t* p, soul_fragment t, timespan_t time, expr_t* e )
: event_t( *p, time ), dh( p ), type( t ), expr( e )
{
}

Expand All @@ -5013,8 +5013,20 @@ struct pick_up_fragment_t : public demon_hunter_spell_t

void execute() override
{
// Evaluate if_expr to make sure the actor still wants to consume.
if ( frag && frag->active() && ( !expr || expr->eval() ) && dh->active.consume_soul_greater )
// Re-select a fragment at execution time rather than storing a pointer
// from when the action fired. The original fragment may have been consumed
// and deleted during the movement delay.
soul_fragment_t* frag = nullptr;
for ( auto f : dh->soul_fragments )
{
if ( f->is_type( type ) && f->active() )
{
frag = f;
break;
}
}

if ( frag && ( !expr || expr->eval() ) )
{
frag->consume( false );
}
Expand Down Expand Up @@ -5204,7 +5216,7 @@ struct pick_up_fragment_t : public demon_hunter_spell_t
timespan_t time = calculate_movement_time( frag );

assert( p()->soul_fragment_pick_up == nullptr );
p()->soul_fragment_pick_up = make_event<pick_up_event_t>( *sim, frag, time, if_expr.get() );
p()->soul_fragment_pick_up = make_event<pick_up_event_t>( *sim, p(), type, time, if_expr.get() );
}

bool ready() override
Expand Down
Loading