Merge pull request #7 from rhc54/topic/tup

Replace asprintf with snprintf
openpmix · Nov 28, 2023 · 8ac8deb · 8ac8deb
2 parents 4f9b35c + a95caab
commit 8ac8deb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,6 +50,8 @@ config/ltversion.m4
 config/lt~obsolete.m4
 config/missing
 configure
+config/pmishim_get_version.sh~
+configure~
 libtool
 Makefile
 config.status

diff --git a/src/pmi1.c b/src/pmi1.c
@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #endif
 
+#include <stdio.h>
+
 #define ANL_MAPPING "PMI_process_mapping"
 
 #define PMI_MAX_ID_LEN       PMIX_MAX_NSLEN  /* Maximim size of PMI process group ID */
@@ -697,7 +699,7 @@ PMISHIM_EXPORT int PMI_Spawn_multiple(int count,
     pmix_status_t rc = PMIX_SUCCESS;
     pmix_app_t *apps;
     int i, k;
-    size_t j;
+    size_t j, len;
     char *evar;
 
     PMI_CHECK();
@@ -728,11 +730,14 @@ PMISHIM_EXPORT int PMI_Spawn_multiple(int count,
         }
         /* push the preput values into the apps environ */
         for (k = 0; k < preput_keyval_size; k++) {
-            if (0 > asprintf(&evar, "%s=%s", preput_keyval_vector[k].key, preput_keyval_vector[k].val)) {
+	    len = strlen(preput_keyval_vector[k].key) + strlen(preput_keyval_vector[k].val) + 2;
+	    evar = malloc(len);
+            if (0 > snprintf(evar, len, "%s=%s", preput_keyval_vector[k].key, preput_keyval_vector[k].val)) {
                 for (i = 0; i < count; i++) {
                     PMIX_APP_DESTRUCT(&apps[i]);
                 }
                 free(apps);
+		free(evar);
                 return PMIX_ERR_NOMEM;
             }
             PMIx_Argv_append_nosize(&apps[i].env, evar);

diff --git a/src/pmi2.c b/src/pmi2.c
@@ -24,6 +24,7 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#include <stdio.h>
 
 #include "include/pmi2.h"
 #include "pmix.h"
@@ -54,6 +55,7 @@ PMISHIM_EXPORT int PMI2_Init(int *spawned, int *size, int *rank, int *appnum)
     pmix_proc_t proc = myproc;
     proc.rank = PMIX_RANK_WILDCARD;
 
+fprintf(stderr, "PMI2_INIT\n");
     if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
         /* if we didn't see a PMIx server (e.g., missing envar),
          * then allow us to run as a singleton */
@@ -201,7 +203,7 @@ PMISHIM_EXPORT int PMI2_Job_Spawn(int count, const char * cmds[],
     pmix_status_t rc = PMIX_SUCCESS;
     pmix_app_t *apps;
     int i, k;
-    size_t j;
+    size_t j, len;
     char *evar;
 
     PMI2_CHECK();
@@ -230,14 +232,17 @@ PMISHIM_EXPORT int PMI2_Job_Spawn(int count, const char * cmds[],
         }
         /* push the preput values into the apps environ */
         for (k=0; k < preput_keyval_size; k++) {
-            if (0 > asprintf(&evar, "%s=%s", preput_keyval_vector[j].key, preput_keyval_vector[j].val)) {
+	    len = strlen(preput_keyval_vector[j].key) + strlen(preput_keyval_vector[j].val) + 2;
+	    evar = malloc(len);
+            if (0 > snprintf(evar, len, "%s=%s", preput_keyval_vector[j].key, preput_keyval_vector[j].val)) {
                 for (i = 0; i < count; i++) {
                     PMIX_APP_DESTRUCT(&apps[i]);
                 }
                 free(apps);
+		free(evar);
                 return PMIX_ERR_NOMEM;
             }
-            pmix_argv_append_nosize(&apps[i].env, evar);
+            PMIx_Argv_append_nosize(&apps[i].env, evar);
             free(evar);
         }
     }