1
1

Merge pull request #768 from rhc54/topic/segfault

Fix an annoying segfault caused by incorrect indentation in a loop th…
Этот коммит содержится в:
rhc54 2015-08-01 11:10:37 -07:00
родитель f86a0c9f33 9bc384282a
Коммит e6017c802d

Просмотреть файл

@ -330,8 +330,8 @@ void pmix_server_process_message(pmix_server_peer_t *peer)
* was actually provided so we don't hang if no modex data is being given */
OPAL_LIST_FOREACH_SAFE(req, nextreq, &pmix_server_pending_dmx_reqs, pmix_server_dmx_req_t) {
if (0 == opal_compare_proc(id, req->target)) {
/* yes - deliver a copy */
reply = OBJ_NEW(opal_buffer_t);
/* yes - deliver a copy */
if (NULL == req->proxy) {
/* pack the status */
ret = OPAL_SUCCESS;
@ -370,7 +370,6 @@ void pmix_server_process_message(pmix_server_peer_t *peer)
OBJ_DESTRUCT(&buf);
/* pass the local blob(s) */
opal_dss.copy_payload(reply, &blocal);
}
/* use the PMIX send to return the data */
PMIX_SERVER_QUEUE_SEND(req->peer, req->tag, reply);
} else {
@ -424,6 +423,7 @@ void pmix_server_process_message(pmix_server_peer_t *peer)
opal_list_remove_item(&pmix_server_pending_dmx_reqs, &req->super);
OBJ_RELEASE(req);
}
}
OBJ_DESTRUCT(&blocal);
OBJ_DESTRUCT(&bremote);