Silence more Coverity warnings

rhc54 · rhc54 · commit fb15a60992a8 · 2025-09-15T08:32:45.000-06:00
489769  489768
488242  488236
488235 488224
488213 488203
488198 488195
488192 488185
488179

Signed-off-by: Ralph Castain &lt;rhc@pmix.org&gt;
diff --git a/src/mca/ess/base/ess_base_bootstrap.c b/src/mca/ess/base/ess_base_bootstrap.c
@@ -151,9 +151,15 @@ int prte_ess_base_bootstrap(void)
 
         /* identify and cache the option */
         if (0 == strcmp(line, "ClusterName")) {
+            if (NULL != cluster) {
+                free(cluster);
+            }
             cluster = strdup(ptr);
 
         } else if (0 == strcmp(line, "DVMControllerHost")) {
+            if (NULL != ctrlhost) {
+                free(ctrlhost);
+            }
             ctrlhost = strdup(ptr);
 
         } else if (0 == strcmp(line, "DVMControllerPort")) {
@@ -163,18 +169,33 @@ int prte_ess_base_bootstrap(void)
             prtedport = strtoul(ptr, NULL, 10);
 
         } else if (0 == strcmp(line, "DVMNodes")) {
+            if (NULL == dvmnodes) {
+                free(dvmnodes);
+            }
             dvmnodes = strdup(ptr);
 
         } else if (0 == strcmp(line, "DVMTempDir")) {
+            if (NULL == dvmtmpdir) {
+                free(dvmtmpdir);
+            }
             dvmtmpdir = strdup(ptr);
 
         } else if (0 == strcmp(line, "SessionTmpDir")) {
+            if (NULL != sessiontmpdir) {
+                free(sessiontmpdir);
+            }
             sessiontmpdir = strdup(ptr);
 
         } else if (0 == strcmp(line, "ControllerLogPath")) {
+            if (NULL != ctrllogpath) {
+                free(ctrllogpath);
+            }
             ctrllogpath = strdup(ptr);
 
         } else if (0 == strcmp(line, "PRTEDLogPath")) {
+            if (NULL != prtedlogpath) {
+                free(prtedlogpath);
+            }
             prtedlogpath = strdup(ptr);
         }
         free(line);
diff --git a/src/mca/grpcomm/direct/grpcomm_direct_group.c b/src/mca/grpcomm/direct/grpcomm_direct_group.c
@@ -586,19 +586,43 @@ void prte_grpcomm_direct_grp_recv(int status, pmix_proc_t *sender,
                 PMIx_Info_list_convert(coll->grpinfo, &darray);
                 info = (pmix_info_t*)darray.array;
                 ninfo = darray.size;
-                PMIx_Data_pack(NULL, reply, &ninfo, 1, PMIX_SIZE);
+                rc = PMIx_Data_pack(NULL, reply, &ninfo, 1, PMIX_SIZE);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    PMIX_DATA_BUFFER_RELEASE(reply);
+                    PMIX_RELEASE(sig);
+                    return;
+                }
                 if (0 < ninfo) {
-                    PMIx_Data_pack(NULL, reply, info, ninfo, PMIX_INFO);
+                   rc =  PMIx_Data_pack(NULL, reply, info, ninfo, PMIX_INFO);
+                    if (PMIX_SUCCESS != rc) {
+                        PMIX_ERROR_LOG(rc);
+                        PMIX_DATA_BUFFER_RELEASE(reply);
+                        PMIX_RELEASE(sig);
+                        return;
+                    }
                 }
                 PMIX_DATA_ARRAY_DESTRUCT(&darray);
 
                 // pack any endpts
                 PMIx_Info_list_convert(coll->endpts, &darray);
                 info = (pmix_info_t*)darray.array;
                 ninfo = darray.size;
-                PMIx_Data_pack(NULL, reply, &ninfo, 1, PMIX_SIZE);
+                rc = PMIx_Data_pack(NULL, reply, &ninfo, 1, PMIX_SIZE);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    PMIX_DATA_BUFFER_RELEASE(reply);
+                    PMIX_RELEASE(sig);
+                    return;
+                }
                 if (0 < ninfo) {
-                    PMIx_Data_pack(NULL, reply, info, ninfo, PMIX_INFO);
+                    rc = PMIx_Data_pack(NULL, reply, info, ninfo, PMIX_INFO);
+                    if (PMIX_SUCCESS != rc) {
+                        PMIX_ERROR_LOG(rc);
+                        PMIX_DATA_BUFFER_RELEASE(reply);
+                        PMIX_RELEASE(sig);
+                        return;
+                    }
                 }
                 PMIX_DATA_ARRAY_DESTRUCT(&darray);
             }
diff --git a/src/mca/rmaps/base/rmaps_base_frame.c b/src/mca/rmaps/base/rmaps_base_frame.c
@@ -542,7 +542,7 @@ int prte_rmaps_base_set_mapping_policy(prte_job_t *jdata, char *inspec)
         cptr = strdup(ck[0]);
         *ptr = '='; // restore the option
         ++ptr;
-        if (NULL == ptr) {
+        if ('\0' == *ptr) {
             /* malformed option */
             pmix_show_help("help-prte-rmaps-base.txt", "unrecognized-policy",
                            true, "mapping", ck[0]);
diff --git a/src/mca/rmaps/round_robin/rmaps_rr_mappers.c b/src/mca/rmaps/round_robin/rmaps_rr_mappers.c
@@ -545,9 +545,7 @@ int prte_rmaps_rr_bycpu(prte_job_t *jdata, prte_app_context_t *app,
     if (PRTE_ERR_SILENT != rc) {
         pmix_show_help("help-prte-rmaps-rr.txt",
                        "prte-rmaps-rr:not-enough-cpus", true,
-                       (NULL == app) ? "N/A" : app->app,
-                       (NULL == app) ? -1 : app->num_procs,
-                       savecpuset);
+                       app->app, app->num_procs, savecpuset);
     }
     if (NULL != savecpuset) {
         free(savecpuset);
diff --git a/src/mca/schizo/ompi/schizo_ompi.c b/src/mca/schizo/ompi/schizo_ompi.c
@@ -522,19 +522,19 @@ static int parse_cli(char **argv, pmix_cli_result_t *results,
                              results, "help-schizo-ompi.txt");
     if (PMIX_SUCCESS != rc) {
         PMIX_ARGV_FREE_COMPAT(pargv);
-        if (PMIX_OPERATION_SUCCEEDED == rc) {
-            /* pmix cmd line interpreter output result
-             * successfully - usually means version or
-             * some other stock output was generated */
-            return PRTE_OPERATION_SUCCEEDED;
-        }
-        if(warn) {
+        if (warn) {
             for(n = 0; n < cur_caught_pos; n++) {
                 free(caught_single_dashes[n]);
             }
             free(caught_single_dashes);
             free(caught_positions);
         }
+        if (PMIX_OPERATION_SUCCEEDED == rc) {
+            /* pmix cmd line interpreter output result
+             * successfully - usually means version or
+             * some other stock output was generated */
+            return PRTE_OPERATION_SUCCEEDED;
+        }
         return prte_pmix_convert_status(rc);
     }
 
@@ -587,23 +587,23 @@ static int parse_cli(char **argv, pmix_cli_result_t *results,
             free(orig_args);
             free(corrected_args);
         }
+   }
+
+    // cleanup
+    if (warn) {
         for(n = 0; n < cur_caught_pos; n++) {
             free(caught_single_dashes[n]);
         }
         free(caught_single_dashes);
+        caught_single_dashes = NULL;
         free(caught_positions);
+        caught_positions = NULL;
     }
-
+ 
     PMIX_ARGV_FREE_COMPAT(pargv);
     /* check for deprecated options - warn and convert them */
     rc = convert_deprecated_cli(results, silent);
     if (PRTE_SUCCESS != rc) {
-        if (NULL != caught_positions) {
-            free(caught_positions);
-        }
-        if (NULL != caught_single_dashes) {
-            free(caught_single_dashes);
-        }
         return rc;
     }
 
diff --git a/src/mca/state/base/state_base_options.c b/src/mca/state/base/state_base_options.c
@@ -260,7 +260,7 @@ int prte_state_base_set_runtime_options(prte_job_t *jdata, char *spec)
                                    &flag, PMIX_BOOL);
 
             } else if (PMIX_CHECK_CLI_OPTION(options[n], PRTE_CLI_MAX_RESTARTS)) {
-                if ('\0' == *ptr) {
+                if (NULL == ptr || '\0' == *ptr) {
                     /* missing the value */
                     pmix_show_help("help-prte-rmaps-base.txt", "missing-value", true,
                                    "runtime options", options[n], "empty");
diff --git a/src/pmix/pmix-internal.h b/src/pmix/pmix-internal.h
@@ -100,11 +100,13 @@ static inline __prte_attribute_always_inline__ void pmix_proc_hton_intr(pmix_pro
 #define PRTE_PMIX_CONSTRUCT_LOCK(l)                \
     do {                                           \
         PMIX_CONSTRUCT(&(l)->mutex, pmix_mutex_t); \
+        pmix_mutex_lock(&(l)->mutex);              \
         pthread_cond_init(&(l)->cond, NULL);       \
         (l)->active = true;                        \
         (l)->status = 0;                           \
         (l)->msg = NULL;                           \
         PMIX_POST_OBJECT((l));                     \
+        pmix_mutex_unlock(&(l)->mutex);            \
     } while (0)
 
 #define PRTE_PMIX_DESTRUCT_LOCK(l)        \
@@ -163,15 +165,15 @@ static inline __prte_attribute_always_inline__ void pmix_proc_hton_intr(pmix_pro
 #    define PRTE_PMIX_RELEASE_THREAD(lck)                                     \
         do {                                                                  \
             (lck)->active = false;                                            \
-            pthread_cond_broadcast(&(lck)->cond);                             \
+            pthread_cond_signal(&(lck)->cond);                             \
             pmix_mutex_unlock(&(lck)->mutex);                                 \
         } while (0)
 #else
 #    define PRTE_PMIX_RELEASE_THREAD(lck)                   \
         do {                                                \
             assert(0 != pmix_mutex_trylock(&(lck)->mutex)); \
             (lck)->active = false;                          \
-            pthread_cond_broadcast(&(lck)->cond);           \
+            pthread_cond_signal(&(lck)->cond);           \
             pmix_mutex_unlock(&(lck)->mutex);               \
         } while (0)
 #endif
@@ -181,7 +183,7 @@ static inline __prte_attribute_always_inline__ void pmix_proc_hton_intr(pmix_pro
         pmix_mutex_lock(&(lck)->mutex);       \
         (lck)->active = false;                \
         PMIX_POST_OBJECT(lck);                \
-        pthread_cond_broadcast(&(lck)->cond); \
+        pthread_cond_signal(&(lck)->cond); \
         pmix_mutex_unlock(&(lck)->mutex);     \
     } while (0)
 
diff --git a/src/prted/pmix/pmix_server.c b/src/prted/pmix/pmix_server.c
@@ -1389,6 +1389,9 @@ static void pmix_server_dmdx_recv(int status, pmix_proc_t *sender,
     if (NULL != info) {
         for (sz = 0; sz < ninfo; sz++) {
             if (PMIX_CHECK_KEY(&info[sz], PMIX_REQUIRED_KEY)) {
+                if (NULL != key) {
+                    free(key);
+                }
                 key = strdup(info[sz].value.data.string);
                 continue;
             }
diff --git a/src/prted/pmix/pmix_server_dyn.c b/src/prted/pmix/pmix_server_dyn.c
@@ -714,7 +714,6 @@ int prte_pmix_xfer_app(prte_job_t *jdata, pmix_app_t *papp)
         app->app = strdup(papp->cmd);
     } else if (NULL == papp->argv || NULL == papp->argv[0]) {
         PRTE_ERROR_LOG(PRTE_ERR_BAD_PARAM);
-        PMIX_RELEASE(jdata);
         return PRTE_ERR_BAD_PARAM;
     } else {
         app->app = strdup(papp->argv[0]);
