Merge pull request #5682 from grondo/rlist-fixes

librlist: fix segfault when initializing topology from XML in later hwloc versions
flux-framework · Jan 17, 2024 · d00494b · d00494b
2 parents ead829e + 3824a69
commit d00494b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/common/librlist/rhwloc.c b/src/common/librlist/rhwloc.c
@@ -61,7 +61,7 @@ static int init_topo_from_xml (hwloc_topology_t *tp,
                                unsigned long flags)
 {
     if ((topo_init_common (tp, flags) < 0)
-        || (hwloc_topology_set_xmlbuffer (*tp, xml, strlen (xml) + 1) < 0)
+        || (hwloc_topology_set_xmlbuffer (*tp, xml, strlen (xml)) < 0)
         || (hwloc_topology_load (*tp) < 0)) {
         hwloc_topology_destroy (*tp);
         return (-1);

diff --git a/src/common/librlist/rlist.c b/src/common/librlist/rlist.c
@@ -2380,7 +2380,8 @@ struct rlist *rlist_from_hwloc (int rank, const char *xml)
     rlist_destroy (rl);
     rnode_destroy (n);
     free (ids);
-    hwloc_topology_destroy (topo);
+    if (topo)
+        hwloc_topology_destroy (topo);
     return NULL;
 }