fixes for pr 3329

PR 3329 introduced a regression which causes Open MPI's MPI_Intercomm_from_groups method to fail. Related to open-mpi/ompi#12449 Signed-off-by: Howard Pritchard <howardp@lanl.gov>
openpmix · Apr 4, 2024 · 213956c · 213956c
1 parent 2f225b0
commit 213956c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/client/pmix_client_group.c b/src/client/pmix_client_group.c
@@ -1555,7 +1555,7 @@ static void construct_cbfunc(struct pmix_peer_t *pr,
 
     PMIX_INFO_CREATE(iptr, ninfo);
     n = 0;
-    PMIX_INFO_LOAD(&iptr[n], PMIX_GROUP_ID, &cb->grpid, PMIX_STRING);
+    PMIX_INFO_LOAD(&iptr[n], PMIX_GROUP_ID, cb->grpid, PMIX_STRING);
     ++n;
     if (0 < nmembers) {
         PMIX_INFO_LOAD(&iptr[n], PMIX_GROUP_MEMBERSHIP, &darray, PMIX_DATA_ARRAY);

diff --git a/src/include/pmix_globals.c b/src/include/pmix_globals.c
@@ -585,9 +585,11 @@ static void grdes(pmix_group_t *p)
 {
     if (NULL != p->grpid) {
         free(p->grpid);
+        p->grpid = NULL;
     }
     if (NULL != p->members) {
         PMIX_PROC_FREE(p->members, p->nmbrs);
+        p->members = NULL;
     }
 }
 PMIX_CLASS_INSTANCE(pmix_group_t,