Fix use after free when using SIMIX_network_wait().

[simgrid.git] / src / gras / Msg / sg_msg.c

diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c
index 69dd85f..fc1b66d 100644 (file)
--- a/src/gras/Msg/sg_msg.c
+++ b/src/gras/Msg/sg_msg.c
@@ -20,26 +20,31 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_msg);
 
 typedef void *gras_trp_bufdata_;
 
-gras_msg_t gras_msg_recv_any(void) {
+gras_msg_t gras_msg_recv_any(void)
+{
   gras_trp_procdata_t trp_proc =
       (gras_trp_procdata_t) gras_libdata_by_name("gras_trp");
   gras_msg_t msg;
   /* Build a dynar of all communications I could get something from */
-  xbt_dynar_t comms = xbt_dynar_new(sizeof(smx_comm_t),NULL);
+  xbt_dynar_t comms = xbt_dynar_new(sizeof(smx_comm_t), NULL);
   unsigned int cursor = 0;
   int got = 0;
   smx_comm_t comm = NULL;
   gras_socket_t sock = NULL;
   gras_trp_sg_sock_data_t sock_data;
-  xbt_dynar_foreach(trp_proc->sockets,cursor,sock) {
+  xbt_dynar_foreach(trp_proc->sockets, cursor, sock) {
     sock_data = (gras_trp_sg_sock_data_t) sock->data;
 
 
-    DEBUG5("Consider socket %p (data:%p; Here rdv: %p; Remote rdv: %p; Comm %p) to get a message",
-          sock,sock_data,
-          (sock_data->server==SIMIX_process_self())?sock_data->rdv_server:sock_data->rdv_client,
-          (sock_data->server==SIMIX_process_self())?sock_data->rdv_client:sock_data->rdv_server,
-              sock_data->comm_recv);
+    DEBUG5
+        ("Consider socket %p (data:%p; Here rdv: %p; Remote rdv: %p; Comm %p) to get a message",
+         sock, sock_data,
+         (sock_data->server ==
+          SIMIX_process_self())? sock_data->
+         rdv_server : sock_data->rdv_client,
+         (sock_data->server ==
+          SIMIX_process_self())? sock_data->
+         rdv_client : sock_data->rdv_server, sock_data->comm_recv);
 
 
     /* The following assert fails in some valid conditions, we need to
@@ -70,28 +75,34 @@ gras_msg_t gras_msg_recv_any(void) {
      *    when that iterator is equal to "got", the result of waitany. Not needed if B holds.
      */
     xbt_assert1(sock_data->comm_recv,
-        "Comm_recv of socket %p is empty; please report that nasty bug",sock);
+                "Comm_recv of socket %p is empty; please report that nasty bug",
+                sock);
     /* End of paranoia */
 
     VERB3("Copy comm_recv %p rdv:%p (other rdv:%p)",
-        sock_data->comm_recv,
-        (sock_data->server==SIMIX_process_self())?sock_data->rdv_server:sock_data->rdv_client,
-        (sock_data->server==SIMIX_process_self())?sock_data->rdv_client:sock_data->rdv_server);
-    xbt_dynar_push(comms,&(sock_data->comm_recv));
+          sock_data->comm_recv,
+          (sock_data->server ==
+           SIMIX_process_self())? sock_data->
+          rdv_server : sock_data->rdv_client,
+          (sock_data->server ==
+           SIMIX_process_self())? sock_data->
+          rdv_client : sock_data->rdv_server);
+    xbt_dynar_push(comms, &(sock_data->comm_recv));
   }
-  VERB1("Wait on %ld 'sockets'",xbt_dynar_length(comms));
+  VERB1("Wait on %ld 'sockets'", xbt_dynar_length(comms));
   /* Wait for the end of any of these communications */
   got = SIMIX_network_waitany(comms);
 
   /* retrieve the message sent in that communication */
-  xbt_dynar_get_cpy(comms,got,&(comm));
-  msg=SIMIX_communication_get_data(comm);
-  VERB1("Got something. Communication %p's over",comm);
+  xbt_dynar_get_cpy(comms, got, &(comm));
+  msg = SIMIX_communication_get_data(comm);
+  VERB1("Got something. Communication %p's over", comm);
+  SIMIX_communication_destroy(comm);
 
   /* Reinstall a waiting communication on that rdv */
   /* Get the sock again
    * For that, we use the fact that */
-  sock=xbt_dynar_get_as(trp_proc->sockets,got,gras_socket_t);
+  sock = xbt_dynar_get_as(trp_proc->sockets, got, gras_socket_t);
 /*  xbt_dynar_foreach(trp_proc->sockets,cursor,sock) {
     sock_data = (gras_trp_sg_sock_data_t) sock->data;
     if (sock_data->comm_recv && sock_data->comm_recv == comm)
@@ -99,12 +110,11 @@ gras_msg_t gras_msg_recv_any(void) {
   }
   */
   sock_data = (gras_trp_sg_sock_data_t) sock->data;
-  sock_data->comm_recv = SIMIX_network_irecv(
-      sock_data->rdv_server!=NULL?
-      //(sock_data->server==SIMIX_process_self())?
-                                                sock_data->rdv_server
-                                               :sock_data->rdv_client,
-      NULL,0);
+  sock_data->comm_recv =
+      SIMIX_network_irecv(sock_data->rdv_server != NULL ?
+                          //(sock_data->server==SIMIX_process_self())?
+                          sock_data->rdv_server
+                          : sock_data->rdv_client, NULL, 0);
 
   return msg;
 }
@@ -121,8 +131,10 @@ void gras_msg_send_ext(gras_socket_t sock,
   smx_comm_t comm;
   gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data;
 
-  smx_rdv_t target_rdv = (sock_data->server==SIMIX_process_self())?sock_data->rdv_client
-                                                                  :sock_data->rdv_server;
+  smx_rdv_t target_rdv =
+      (sock_data->server ==
+       SIMIX_process_self())? sock_data->
+      rdv_client : sock_data->rdv_server;
 
   /*initialize gras message */
   msg = xbt_new(s_gras_msg_t, 1);
@@ -131,14 +143,15 @@ void gras_msg_send_ext(gras_socket_t sock,
   msg->type = msgtype;
   msg->ID = ID;
 
-  VERB2("Send msg %s to rdv %p", msgtype->name,target_rdv);
+  VERB2("Send msg %s to rdv %p", msgtype->name, target_rdv);
 
   if (kind == e_gras_msg_kind_rpcerror) {
     /* error on remote host, careful, payload is an exception */
     msg->payl_size = gras_datadesc_size(gras_datadesc_by_name("ex_t"));
     msg->payl = xbt_malloc(msg->payl_size);
-    whole_payload_size = gras_datadesc_memcpy(gras_datadesc_by_name("ex_t"),
-                                              payload, msg->payl);
+    whole_payload_size =
+        gras_datadesc_memcpy(gras_datadesc_by_name("ex_t"), payload,
+                             msg->payl);
   } else if (kind == e_gras_msg_kind_rpcanswer) {
     msg->payl_size = gras_datadesc_size(msgtype->answer_type);
     if (msg->payl_size)
@@ -157,9 +170,9 @@ void gras_msg_send_ext(gras_socket_t sock,
                                                 payload, msg->payl);
   }
 
-  SIMIX_network_send(target_rdv, whole_payload_size,-1,-1,&msg,sizeof(void*),&comm,msg);
+  SIMIX_network_send(target_rdv, whole_payload_size, -1, -1, &msg,
+                     sizeof(void *), &comm, msg);
 
   VERB0("Message sent");
 
 }
-