From 9a99b01f8d3b2be491f9f8412c6f894d30d7e2fe Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Fri, 30 Aug 2019 16:15:15 +0200 Subject: [PATCH] vircgroupv2: fix abort in VIR_AUTOFREE Introduced by commit that tried to fix an issue where we would fail to parse values from files. We cannot change the original pointer that is going to be used by VIR_AUTOFREE. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1747440 Signed-off-by: Pavel Hrdina Acked-by: Peter Krempa --- src/util/vircgroupv2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index c62ee0d933..2aca4e5d62 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -849,6 +849,7 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group, VIR_AUTOFREE(char *) path = NULL; VIR_AUTOFREE(char *) str = NULL; VIR_AUTOFREE(char *) value = NULL; + char *tmp; if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "io.weight", &path) < 0) { @@ -869,7 +870,7 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group, if (!str) { *weight = 0; - } else if (virStrToLong_ui(str, &str, 10, weight) < 0) { + } else if (virStrToLong_ui(str, &tmp, 10, weight) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse '%s' as an integer"), str); @@ -1576,6 +1577,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota) { VIR_AUTOFREE(char *) str = NULL; + char *tmp; if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, "cpu.max", &str) < 0) { @@ -1587,7 +1589,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group, return 0; } - if (virStrToLong_ll(str, &str, 10, cfs_quota) < 0) { + if (virStrToLong_ll(str, &tmp, 10, cfs_quota) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse value '%s' from cpu.max."), str); return -1;