From 044fea8df7387c64a143fe418cd1ffc6ef0451ac Mon Sep 17 00:00:00 2001 From: John Westlund Date: Fri, 2 Oct 2015 15:59:48 -0700 Subject: [PATCH] re-order != comparison, OBJ_RELEASE mca_oob_tcp_addr_t on failure --- orte/mca/oob/tcp/oob_tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orte/mca/oob/tcp/oob_tcp.c b/orte/mca/oob/tcp/oob_tcp.c index b041f9624c..570ff7d27a 100644 --- a/orte/mca/oob/tcp/oob_tcp.c +++ b/orte/mca/oob/tcp/oob_tcp.c @@ -290,8 +290,9 @@ static void process_set_peer(int fd, short args, void *cbdata) } maddr = OBJ_NEW(mca_oob_tcp_addr_t); - if ((rc = parse_uri(pop->af_family, pop->net, pop->port, (struct sockaddr_storage*) &(maddr->addr))) != ORTE_SUCCESS) { + if (ORTE_SUCCESS != (rc = parse_uri(pop->af_family, pop->net, pop->port, (struct sockaddr_storage*) &(maddr->addr)))) { ORTE_ERROR_LOG(rc); + OBJ_RELEASE(maddr); goto cleanup; } @@ -301,7 +302,6 @@ static void process_set_peer(int fd, short args, void *cbdata) ORTE_NAME_PRINT(&pop->peer), (NULL == pop->net) ? "NULL" : pop->net, (NULL == pop->port) ? "NULL" : pop->port); - /* memcpy(&maddr->addr, &inaddr, sizeof(inaddr)); */ opal_list_append(&peer->addrs, &maddr->super); cleanup: