Skip to content

opal coverity fixes #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 29, 2015
Merged

opal coverity fixes #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e2bc2c
btl/openib: fix coverity issue
hjelmn May 29, 2015
1d27b1f
pmix/native: fix coverity issue
hjelmn May 29, 2015
7b7993e
pmix/base: fix coverity issue
hjelmn May 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions opal/mca/btl/openib/btl_openib_endpoint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,13 +613,13 @@ void mca_btl_openib_endpoint_connected(mca_btl_openib_endpoint_t *endpoint)
opal_progress_event_users_decrement();

if(MCA_BTL_XRC_ENABLED) {
while(master && !opal_list_is_empty(&endpoint->ib_addr->pending_ep)) {
ep_item = opal_list_remove_first(&endpoint->ib_addr->pending_ep);
ep = (mca_btl_openib_endpoint_t *)ep_item;
if (OPAL_SUCCESS !=
opal_btl_openib_connect_base_start(endpoint->endpoint_local_cpc,
ep)) {
BTL_ERROR(("Failed to connect pending endpoint\n"));
if (master) {
while (NULL != (ep_item = opal_list_remove_first(&endpoint->ib_addr->pending_ep))) {
ep = (mca_btl_openib_endpoint_t *)ep_item;
if (OPAL_SUCCESS !=
opal_btl_openib_connect_base_start(endpoint->endpoint_local_cpc, ep)) {
BTL_ERROR(("Failed to connect pending endpoint\n"));
}
}
}
OPAL_THREAD_UNLOCK(&endpoint->ib_addr->addr_lock);
Expand Down
8 changes: 2 additions & 6 deletions opal/mca/pmix/base/pmix_base_fns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
* Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science
Expand Down Expand Up @@ -424,11 +424,7 @@ int opal_pmix_base_cache_keys_locally(const opal_process_name_t* id, const char*
kv->data.byte = *tmp3;
break;
case OPAL_STRING:
if (NULL != tmp3) {
kv->data.string = strdup(tmp3);
} else {
kv->data.string = NULL;
}
kv->data.string = strdup(tmp3);
break;
case OPAL_PID:
kv->data.pid = strtoul(tmp3, NULL, 10);
Expand Down
10 changes: 7 additions & 3 deletions opal/mca/pmix/native/pmix_native.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -699,10 +701,12 @@ static void fencenb_cbfunc(opal_buffer_t *buf, void *cbdata)
}

/* if a callback was provided, execute it */
if (NULL != cb && NULL != cb->cbfunc) {
cb->cbfunc(rc, NULL, cb->cbdata);
if (NULL != cb) {
if (NULL != cb->cbfunc) {
cb->cbfunc(rc, NULL, cb->cbdata);
}
OBJ_RELEASE(cb);
}
OBJ_RELEASE(cb);
}

static int native_fence_nb(opal_process_name_t *procs, size_t nprocs,
Expand Down