Skip to content

Commit 43ffa85

Browse files
committed
Fix warnings in instance code
We were never checking the return value from PMIX_UNLOAD and were not properly checking against GROUP_NULL. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent c50bc74 commit 43ffa85

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

ompi/instance/instance.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,11 @@ static void ompi_instance_get_num_psets_complete (pmix_status_t status,
949949
&info[n].value,
950950
(void **)&num_pmix_psets,
951951
&sz);
952+
if (rc != PMIX_SUCCESS) {
953+
opal_argv_free (ompi_mpi_instance_pmix_psets);
954+
ompi_mpi_instance_pmix_psets = NULL;
955+
goto done;
956+
}
952957
if (num_pmix_psets != ompi_mpi_instance_num_pmix_psets) {
953958
opal_argv_free (ompi_mpi_instance_pmix_psets);
954959
ompi_mpi_instance_pmix_psets = NULL;
@@ -962,12 +967,18 @@ static void ompi_instance_get_num_psets_complete (pmix_status_t status,
962967
&info[n].value,
963968
(void **)&pset_names,
964969
&sz);
970+
if (rc != PMIX_SUCCESS) {
971+
opal_argv_free (ompi_mpi_instance_pmix_psets);
972+
ompi_mpi_instance_pmix_psets = NULL;
973+
goto done;
974+
}
965975
ompi_mpi_instance_pmix_psets = opal_argv_split (pset_names, ',');
966976
ompi_mpi_instance_num_pmix_psets = opal_argv_count (ompi_mpi_instance_pmix_psets);
967977
free(pset_names);
968978
}
969979
}
970980

981+
done:
971982
if (NULL != release_fn) {
972983
release_fn(release_cbdata);
973984
}
@@ -1258,7 +1269,10 @@ static int ompi_instance_get_pmix_pset_size (ompi_instance_t *instance, const ch
12581269

12591270
int ompi_group_from_pset (ompi_instance_t *instance, const char *pset_name, ompi_group_t **group_out)
12601271
{
1261-
if (group_out == MPI_GROUP_NULL) {
1272+
if (NULL == group_out) {
1273+
return OMPI_ERR_BAD_PARAM;
1274+
}
1275+
if (*group_out == MPI_GROUP_NULL) {
12621276
return OMPI_ERR_BAD_PARAM;
12631277
}
12641278

0 commit comments

Comments
 (0)