Skip to content

Fix crash due to access after delete #3449

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

Merged
zimmy87 merged 2 commits into from
Mar 8, 2021
Merged

Fix crash due to access after delete #3449

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
b6b945a
Signal: Fix crash due to erase during iteration
rajat2004 Mar 7, 2021
424190e
Perform some cleanup in FlyingPawn
rajat2004 Mar 7, 2021
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
5 changes: 3 additions & 2 deletions AirLib/include/common/common_utils/Signal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ class Signal {

// calls all connected functions
void emit(Args... p) {
for (auto it : slots_) {
it.second(p...);
for(auto it=slots_.begin(); it!=slots_.end(); ) {
// Increment here so that the entry can be erased from inside the method as well
(it++)->second(p...);
}
}

Expand Down
3 changes: 3 additions & 0 deletions Unreal/Plugins/AirSim/Source/Vehicles/Multirotor/FlyingPawn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ void AFlyingPawn::EndPlay(const EEndPlayReason::Type EndPlayReason)
camera_back_center_ = nullptr;
camera_bottom_center_ = nullptr;

pawn_events_.getActuatorSignal().disconnect_all();
rotating_movements_.Empty();

Super::EndPlay(EndPlayReason);
}

Expand Down