Postpone the destruction of Task::current_activity_.

Fixes heap-use-after-free spotted by ASan and valgrind.

diff --git a/include/simgrid/plugins/task.hpp b/include/simgrid/plugins/task.hpp
index bf8609d..62eb12a 100644 (file)
--- a/include/simgrid/plugins/task.hpp
+++ b/include/simgrid/plugins/task.hpp
@@ -42,6 +42,7 @@ protected:
   int queued_execs_ = 0;
   int count_        = 0;
   bool working_     = false;
+  s4u::ActivityPtr previous_activity_;
   s4u::ActivityPtr current_activity_;
   xbt::signal<void(Task*)> on_this_start_;
   xbt::signal<void(Task*)> on_this_end_;

diff --git a/src/plugins/task.cpp b/src/plugins/task.cpp
index c84f83d..dca0c90 100644 (file)
--- a/src/plugins/task.cpp
+++ b/src/plugins/task.cpp
@@ -82,6 +82,8 @@ void Task::complete()
   count_++;
   on_this_end_(this);
   Task::on_end(this);
+  if (current_activity_)
+    previous_activity_ = std::move(current_activity_);
   for (auto const& t : successors_)
     t->receive(this);
   if (ready_to_run())