Merge pull request #6807 from ggouaillardet/topic/ess_base_leak

rhc54 · web-flow · commit 6f1fa354326e · 2019-07-12T07:03:31.000-07:00
ess/base: fix a misc memory leak in orte_ess_base_proc_binding()
diff --git a/orte/mca/ess/base/ess_base_fns.c b/orte/mca/ess/base/ess_base_fns.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2014-2018 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2017 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -278,6 +278,8 @@ int orte_ess_base_proc_binding(void)
                     }
                 }
             }
+        } else {
+            hwloc_bitmap_free(cpus);
         }
     } else {
         OPAL_OUTPUT_VERBOSE((5, orte_ess_base_framework.framework_output,

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`* Copyright (c) 2011-2012 Los Alamos National Security, LLC.`
`14`	`14`	`* All rights reserved.`
`15`	`15`	`* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.`
`16`		`- * Copyright (c) 2014-2017 Research Organization for Information Science`
`17`		`- * and Technology (RIST). All rights reserved.`
	`16`	`+ * Copyright (c) 2014-2019 Research Organization for Information Science`
	`17`	`+ * and Technology (RIST). All rights reserved.`
`18`	`18`	`* $COPYRIGHT$`
`19`	`19`	`*`
`20`	`20`	`* Additional copyrights may follow`
`@@ -278,6 +278,8 @@ int orte_ess_base_proc_binding(void)`
`278`	`278`	`}`
`279`	`279`	`}`
`280`	`280`	`}`
	`281`	`+ } else {`
	`282`	`+ hwloc_bitmap_free(cpus);`
`281`	`283`	`}`
`282`	`284`	`} else {`
`283`	`285`	`OPAL_OUTPUT_VERBOSE((5, orte_ess_base_framework.framework_output,`