1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00

virtpm: Fix @path handling in virTPMEmulatorInit()

This function finds "swtmp", "swtpm_setup" and "swtpm_ioctl"
binaries in $PATH and stores resolved paths in global variables
so that they can be obtainer later. Anyway, the resolved path is
marked as g_autofree and to avoid its freeing later on in the
function the variable is set to NULL manually. Well, we have
g_steal_pointer() for that.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2021-02-25 11:58:38 +01:00
parent 25ebb45a81
commit 144cb28e6b

View File

@ -323,16 +323,14 @@ virTPMEmulatorInit(void)
_("Could not stat %s"), path); _("Could not stat %s"), path);
goto cleanup; goto cleanup;
} }
*prgs[i].path = path; *prgs[i].path = g_steal_pointer(&path);
if (prgs[i].caps) { if (prgs[i].caps) {
*prgs[i].caps = virTPMGetCaps(prgs[i].typeFromStringFn, *prgs[i].caps = virTPMGetCaps(prgs[i].typeFromStringFn,
path, prgs[i].parm); *prgs[i].path, prgs[i].parm);
path = NULL;
if (!*prgs[i].caps) if (!*prgs[i].caps)
goto cleanup; goto cleanup;
} }
path = NULL;
} }
} }