Use "std::vector" instead of C-style array (sonar).

[simgrid.git] / src / mc / api / RemoteApp.cpp

diff --git a/src/mc/api/RemoteApp.cpp b/src/mc/api/RemoteApp.cpp
index 2a9a574..cc4cea6 100644 (file)
--- a/src/mc/api/RemoteApp.cpp
+++ b/src/mc/api/RemoteApp.cpp
@@ -149,7 +149,7 @@ unsigned long RemoteApp::get_maxpid() const
   return model_checker_->get_remote_process().get_maxpid();
 }
 
-void RemoteApp::get_actors_status(std::map<aid_t, ActorState>& whereto)
+void RemoteApp::get_actors_status(std::map<aid_t, ActorState>& whereto) const
 {
   s_mc_message_t msg;
   memset(&msg, 0, sizeof msg);
@@ -165,13 +165,16 @@ void RemoteApp::get_actors_status(std::map<aid_t, ActorState>& whereto)
              to_c_str(answer.type), (int)answer.type, (int)received, (int)MessageType::ACTORS_STATUS_REPLY,
              (int)sizeof(answer));
 
-  s_mc_message_actors_status_one_t status[answer.count];
-  received = model_checker_->channel().receive(&status, sizeof(status));
-  xbt_assert(static_cast<size_t>(received) == sizeof(status));
+  std::vector<s_mc_message_actors_status_one_t> status(answer.count);
+  if (answer.count > 0) {
+    size_t size = status.size() * sizeof(s_mc_message_actors_status_one_t);
+    received    = model_checker_->channel().receive(status.data(), size);
+    xbt_assert(static_cast<size_t>(received) == size);
+  }
 
   whereto.clear();
   for (auto const& actor : status)
-    whereto.insert(std::make_pair(actor.aid, ActorState(actor.aid, actor.enabled, actor.max_considered)));
+    whereto.try_emplace(actor.aid, actor.aid, actor.enabled, actor.max_considered);
 }
 
 void RemoteApp::check_deadlock() const