From a04f1cd64321505969495bf8a40c292a58c41bbc Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Tue, 29 Dec 2015 20:37:25 -0800
Subject: [PATCH] Silence some Coverity warnings

---
 opal/mca/pmix/pmix120/pmix/src/server/pmix_server_ops.c | 1 -
 opal/mca/pmix/pmix120/pmix120_client.c                  | 6 +++++-
 opal/mca/pmix/pmix120/pmix_pmix120.c                    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/opal/mca/pmix/pmix120/pmix/src/server/pmix_server_ops.c b/opal/mca/pmix/pmix120/pmix/src/server/pmix_server_ops.c
index a6f0da5447..25434ad0e2 100644
--- a/opal/mca/pmix/pmix120/pmix/src/server/pmix_server_ops.c
+++ b/opal/mca/pmix/pmix120/pmix/src/server/pmix_server_ops.c
@@ -1088,7 +1088,6 @@ pmix_status_t pmix_server_notify_error_client(pmix_peer_t *peer,
         PMIX_PROC_CREATE(procs, nprocs);
         cnt = nprocs;
         if (PMIX_SUCCESS != (rc = pmix_bfrop.unpack(buf, procs, &cnt, PMIX_PROC))) {
-            PMIX_PROC_FREE(procs, nprocs);
             PMIX_ERROR_LOG(rc);
             goto exit;
         }
diff --git a/opal/mca/pmix/pmix120/pmix120_client.c b/opal/mca/pmix/pmix120/pmix120_client.c
index 05a7a54bf3..d9a0c4b341 100644
--- a/opal/mca/pmix/pmix120/pmix120_client.c
+++ b/opal/mca/pmix/pmix120/pmix120_client.c
@@ -129,6 +129,7 @@ int pmix120_abort(int flag, const char *msg,
                 }
             }
             if (NULL == job) {
+                PMIX_PROC_FREE(parray, cnt);
                 return OPAL_ERR_NOT_FOUND;
             }
             (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN);
@@ -230,6 +231,7 @@ int pmix120_fence(opal_list_t *procs, int collect_data)
                 }
             }
             if (NULL == job) {
+                PMIX_PROC_FREE(parray, cnt);
                 return OPAL_ERR_NOT_FOUND;
             }
             (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN);
@@ -292,6 +294,7 @@ int pmix120_fencenb(opal_list_t *procs, int collect_data,
                 }
             }
             if (NULL == job) {
+                PMIX_PROC_FREE(parray, cnt);
                 return OPAL_ERR_NOT_FOUND;
             }
             (void)strncpy(parray[n].nspace, job->nspace, PMIX_MAX_NSLEN);
@@ -999,6 +1002,7 @@ int pmix120_connect(opal_list_t *procs)
             }
         }
         if (NULL == job) {
+            PMIX_PROC_FREE(parray, cnt);
             OPAL_ERROR_LOG(OPAL_ERR_NOT_FOUND);
             return OPAL_ERR_NOT_FOUND;
         }
@@ -1205,7 +1209,7 @@ int pmix120_resolve_peers(const char *nodename, opal_jobid_t jobid,
             }
             if (NULL == job) {
                 job = OBJ_NEW(opal_pmix120_jobid_trkr_t);
-                (void)strncpy(job->nspace, nspace, PMIX_MAX_NSLEN);
+                (void)strncpy(job->nspace, array[n].nspace, PMIX_MAX_NSLEN);
                 job->jobid = jobid;
                 opal_list_append(&mca_pmix_pmix120_component.jobids, &job->super);
             }
diff --git a/opal/mca/pmix/pmix120/pmix_pmix120.c b/opal/mca/pmix/pmix120/pmix_pmix120.c
index f07a379a43..5bee6ff683 100644
--- a/opal/mca/pmix/pmix120/pmix_pmix120.c
+++ b/opal/mca/pmix/pmix120/pmix_pmix120.c
@@ -196,7 +196,7 @@ static void notify(pmix_status_t status,
     for (n=1; n < ninfo; n++) {
         iptr = OBJ_NEW(opal_value_t);
         iptr->key = strdup(info[n].key);
-        pmix120_value_unload(iptr, &info[n].value);
+        (void)pmix120_value_unload(iptr, &info[n].value);
         opal_list_append(&cd->info, &iptr->super);
     }