Merge pull request open-mpi#176 from rhc54/topic/cov

rhc54 · web-flow · commit 1e56e638424d · 2018-12-22T07:24:05.000-08:00
Fix coverity warning
diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c
@@ -734,21 +734,19 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer,
                 goto REPORT_ERROR;
             }
         }
+        free(ppn);
         /* compute the ranks and add the proc objects
          * to the jdata->procs array */
         if (ORTE_SUCCESS != (rc = orte_rmaps_base_compute_vpids(jdata))) {
             ORTE_ERROR_LOG(rc);
-            free(ppn);
             goto REPORT_ERROR;
         }
         /* and finally, compute the local and node ranks */
         if (ORTE_SUCCESS != (rc = orte_rmaps_base_compute_local_ranks(jdata))) {
             ORTE_ERROR_LOG(rc);
-            free(ppn);
             goto REPORT_ERROR;
         }
     }
-    free(ppn);
 
 #if OPAL_PMIX_VERSION >= 3
     /* unpack the buffer containing any application setup info - there

Original file line number	Diff line number	Diff line change
`@@ -734,21 +734,19 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer,`
`734`	`734`	`goto REPORT_ERROR;`
`735`	`735`	`}`
`736`	`736`	`}`
	`737`	`+ free(ppn);`
`737`	`738`	`/* compute the ranks and add the proc objects`
`738`	`739`	`* to the jdata->procs array */`
`739`	`740`	`if (ORTE_SUCCESS != (rc = orte_rmaps_base_compute_vpids(jdata))) {`
`740`	`741`	`ORTE_ERROR_LOG(rc);`
`741`		`- free(ppn);`
`742`	`742`	`goto REPORT_ERROR;`
`743`	`743`	`}`
`744`	`744`	`/* and finally, compute the local and node ranks */`
`745`	`745`	`if (ORTE_SUCCESS != (rc = orte_rmaps_base_compute_local_ranks(jdata))) {`
`746`	`746`	`ORTE_ERROR_LOG(rc);`
`747`		`- free(ppn);`
`748`	`747`	`goto REPORT_ERROR;`
`749`	`748`	`}`
`750`	`749`	`}`
`751`		`- free(ppn);`
`752`	`750`
`753`	`751`	`#if OPAL_PMIX_VERSION >= 3`
`754`	`752`	`/* unpack the buffer containing any application setup info - there`