hwloc/base: fix some off-by-one errors

ggouaillardet · jsquyres · commit 73d104f6959c · 2019-01-29T07:36:56.000-08:00
Signed-off-by: Gilles Gouaillardet &lt;gilles@rist.or.jp&gt;
diff --git a/opal/mca/hwloc/base/hwloc_base_dt.c b/opal/mca/hwloc/base/hwloc_base_dt.c
@@ -98,7 +98,7 @@ int opal_hwloc_unpack(opal_buffer_t *buffer, void *dest,
             free(xmlbuffer);
             goto cleanup;
         }
-        if (0 != hwloc_topology_set_xmlbuffer(t, xmlbuffer, strlen(xmlbuffer))) {
+        if (0 != hwloc_topology_set_xmlbuffer(t, xmlbuffer, strlen(xmlbuffer)+1)) {
             rc = OPAL_ERROR;
             free(xmlbuffer);
             hwloc_topology_destroy(t);
diff --git a/opal/mca/hwloc/base/hwloc_base_util.c b/opal/mca/hwloc/base/hwloc_base_util.c
@@ -371,7 +371,7 @@ int opal_hwloc_base_get_topology(void)
             free(val);
             return OPAL_ERROR;
         }
-        if (0 != hwloc_topology_set_xmlbuffer(opal_hwloc_topology, val, strlen(val))) {
+        if (0 != hwloc_topology_set_xmlbuffer(opal_hwloc_topology, val, strlen(val)+1)) {
             free(val);
             hwloc_topology_destroy(opal_hwloc_topology);
             return OPAL_ERROR;

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ int opal_hwloc_unpack(opal_buffer_t buffer, void dest,`
`98`	`98`	`free(xmlbuffer);`
`99`	`99`	`goto cleanup;`
`100`	`100`	`}`
`101`		`- if (0 != hwloc_topology_set_xmlbuffer(t, xmlbuffer, strlen(xmlbuffer))) {`
	`101`	`+ if (0 != hwloc_topology_set_xmlbuffer(t, xmlbuffer, strlen(xmlbuffer)+1)) {`
`102`	`102`	`rc = OPAL_ERROR;`
`103`	`103`	`free(xmlbuffer);`
`104`	`104`	`hwloc_topology_destroy(t);`
Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ int opal_hwloc_base_get_topology(void)`
`371`	`371`	`free(val);`
`372`	`372`	`return OPAL_ERROR;`
`373`	`373`	`}`
`374`		`- if (0 != hwloc_topology_set_xmlbuffer(opal_hwloc_topology, val, strlen(val))) {`
	`374`	`+ if (0 != hwloc_topology_set_xmlbuffer(opal_hwloc_topology, val, strlen(val)+1)) {`
`375`	`375`	`free(val);`
`376`	`376`	`hwloc_topology_destroy(opal_hwloc_topology);`
`377`	`377`	`return OPAL_ERROR;`