Merge pull request #3596 from rhc54/topic/cov

Silence coverity warnings

orte/mca/rmaps/base/rmaps_base_ranking.c

@@ -413,7 +413,8 @@ static int rank_by(orte_job_t *jdata,
                             return ORTE_ERROR;
                         }
                         /* ignore procs not on this object */
-                        if (!hwloc_bitmap_intersects(obj->cpuset, locale->cpuset)) {
+                        if (NULL == locale ||
+                            !hwloc_bitmap_intersects(obj->cpuset, locale->cpuset)) {
                             opal_output_verbose(5, orte_rmaps_base_framework.framework_output,
                                                 "mca:rmaps:rank_by: proc at position %d is not on object %d",
                                                 j, i);

orte/orted/orted_comm.c

@@ -663,24 +663,32 @@ void orte_daemon_recv(int status, orte_process_name_t* sender,
                 ORTE_ERROR_LOG(ret);
                 free(cmpdata);
                 OBJ_DESTRUCT(&data);
+                OBJ_RELEASE(answer);
+                goto CLEANUP;
             }
             /* pack the compressed length */
             if (ORTE_SUCCESS != (ret = opal_dss.pack(answer, &cmplen, 1, OPAL_SIZE))) {
                 ORTE_ERROR_LOG(ret);
                 free(cmpdata);
                 OBJ_DESTRUCT(&data);
+                OBJ_RELEASE(answer);
+                goto CLEANUP;
             }
             /* pack the uncompressed length */
             if (ORTE_SUCCESS != (ret = opal_dss.pack(answer, &data.bytes_used, 1, OPAL_SIZE))) {
                 ORTE_ERROR_LOG(ret);
                 free(cmpdata);
                 OBJ_DESTRUCT(&data);
+                OBJ_RELEASE(answer);
+                goto CLEANUP;
             }
             /* pack the compressed info */
             if (ORTE_SUCCESS != (ret = opal_dss.pack(answer, cmpdata, cmplen, OPAL_UINT8))) {
                 ORTE_ERROR_LOG(ret);
                 free(cmpdata);
                 OBJ_DESTRUCT(&data);
+                OBJ_RELEASE(answer);
+                goto CLEANUP;
             }
             OBJ_DESTRUCT(&data);
             free(cmpdata);
@@ -691,6 +699,8 @@ void orte_daemon_recv(int status, orte_process_name_t* sender,
                 ORTE_ERROR_LOG(ret);
                 OBJ_DESTRUCT(&data);
                 free(cmpdata);
+                OBJ_RELEASE(answer);
+                goto CLEANUP;
             }
             /* transfer the payload across */
             opal_dss.copy_payload(answer, &data);

orte/util/nidmap.c

@@ -1285,9 +1285,11 @@ int orte_util_nidmap_generate_ppn(orte_job_t *jdata, char **ppn)
             }
         }
         OPAL_LIST_DESTRUCT(&prk[n]);  // releases all the actives objects
-        opal_argv_append_nosize(&cache, ptmp);
+        if (NULL != ptmp) {
-        free(ptmp);
+            opal_argv_append_nosize(&cache, ptmp);
-        ptmp = NULL;
+            free(ptmp);
+            ptmp = NULL;
+        }
     }
     free(prk);
     free(cnt);