Merge pull request #3234 from rhc54/topic/cov

Fix coverity issues

Author: Ralph Castain

opal/mca/pmix/pmix2x/pmix/src/mca/psensor/file/psensor_file.c

@@ -113,7 +113,7 @@ static void ft_destructor(file_tracker_t *ft)
     if (NULL != ft->id) {
         free(ft->id);
     }
-    if (event_active) {
+    if (ft->event_active) {
         pmix_event_del(&ft->ev);
     }
     if (NULL != ft->file) {

opal/mca/pmix/pmix2x/pmix/src/mca/psensor/heartbeat/psensor_heartbeat.c

@@ -88,7 +88,7 @@ static void ft_destructor(pmix_heartbeat_trkr_t *ft)
     if (NULL != ft->id) {
         free(ft->id);
     }
-    if (event_active) {
+    if (ft->event_active) {
         pmix_event_del(&ft->ev);
     }
     if (NULL != ft->info) {

orte/mca/odls/base/odls_base_default_fns.c

@@ -1113,17 +1113,26 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
         }
         if (NULL != effective_dir) {
             free(effective_dir);
+            effective_dir = NULL;
         }
     }
 
   GETOUT:
+    if (NULL != effective_dir) {
+        free(effective_dir);
+        effective_dir = NULL;
+    }
     /* tell the state machine that all local procs for this job
      * were launched so that it can do whatever it needs to do,
      * like send a state update message for all procs to the HNP
      */
     ORTE_ACTIVATE_JOB_STATE(jobdat, ORTE_JOB_STATE_LOCAL_LAUNCH_COMPLETE);
 
   ERROR_OUT:
+    if (NULL != effective_dir) {
+        free(effective_dir);
+        effective_dir = NULL;
+    }
     /* ensure we reset our working directory back to our default location  */
     chdir(basedir);
     /* release the event */
@@ -1716,6 +1725,9 @@ int orte_odls_base_default_restart_proc(orte_proc_t *child,
     /* setup the path */
     if (ORTE_SUCCESS != (rc = setup_path(app, &wdir))) {
         ORTE_ERROR_LOG(rc);
+        if (NULL != wdir) {
+            free(wdir);
+        }
         goto CLEANUP;
     }
 

orte/mca/schizo/slurm/schizo_slurm.c

@@ -148,9 +148,11 @@ static int get_remaining_time(uint32_t *timeleft)
     }
     if (NULL == fgets(output, 256, fp)) {
         free(cmd);
+        pclose(fp);
         return ORTE_ERR_FILE_READ_FAILURE;
     }
     free(cmd);
+    pclose(fp);
     /* the output is returned in a colon-delimited set of fields */
     res = opal_argv_split(output, ':');
     cnt =  opal_argv_count(res);