Fix an annoying segfault caused by incorrect indentation in a loop that causes the buffer to not be created prior to packing.
Этот коммит содержится в:
родитель
f86a0c9f33
Коммит
9bc384282a
@ -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 */
|
* 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) {
|
OPAL_LIST_FOREACH_SAFE(req, nextreq, &pmix_server_pending_dmx_reqs, pmix_server_dmx_req_t) {
|
||||||
if (0 == opal_compare_proc(id, req->target)) {
|
if (0 == opal_compare_proc(id, req->target)) {
|
||||||
/* yes - deliver a copy */
|
|
||||||
reply = OBJ_NEW(opal_buffer_t);
|
reply = OBJ_NEW(opal_buffer_t);
|
||||||
|
/* yes - deliver a copy */
|
||||||
if (NULL == req->proxy) {
|
if (NULL == req->proxy) {
|
||||||
/* pack the status */
|
/* pack the status */
|
||||||
ret = OPAL_SUCCESS;
|
ret = OPAL_SUCCESS;
|
||||||
@ -370,7 +370,6 @@ void pmix_server_process_message(pmix_server_peer_t *peer)
|
|||||||
OBJ_DESTRUCT(&buf);
|
OBJ_DESTRUCT(&buf);
|
||||||
/* pass the local blob(s) */
|
/* pass the local blob(s) */
|
||||||
opal_dss.copy_payload(reply, &blocal);
|
opal_dss.copy_payload(reply, &blocal);
|
||||||
}
|
|
||||||
/* use the PMIX send to return the data */
|
/* use the PMIX send to return the data */
|
||||||
PMIX_SERVER_QUEUE_SEND(req->peer, req->tag, reply);
|
PMIX_SERVER_QUEUE_SEND(req->peer, req->tag, reply);
|
||||||
} else {
|
} 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);
|
opal_list_remove_item(&pmix_server_pending_dmx_reqs, &req->super);
|
||||||
OBJ_RELEASE(req);
|
OBJ_RELEASE(req);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
OBJ_DESTRUCT(&blocal);
|
OBJ_DESTRUCT(&blocal);
|
||||||
OBJ_DESTRUCT(&bremote);
|
OBJ_DESTRUCT(&bremote);
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user