From b3a67644c3c8cae4cc80eea05dc0cddd745b9e99 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 26 Feb 2024 12:42:09 +0100 Subject: [PATCH] nodedevmdevctltest: Fix two memleaks There are two memleaks inside of nodedevmdevctltest: 1) In the testCommandDryRunCallback() - when appending lines to stdinbuf the pointer is overwritten without freeing the old memory it pointed to. 2) In testMdevctlModify() the livecmd variable is reused and since its marked as g_autoptr() the first use leaks. Fixes: 582f27ff15f14fa0e913278c0a2ca9840c3f12f5 Signed-off-by: Michal Privoznik Reviewed-by: Boris Fiuczynski Reviewed-by: Peter Krempa --- tests/nodedevmdevctltest.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index de688c982e..93b0efcb1c 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -33,10 +33,12 @@ testCommandDryRunCallback(const char *const*args G_GNUC_UNUSED, { char **stdinbuf = opaque; - if (*stdinbuf) - *stdinbuf = g_strconcat(*stdinbuf, "\n", input, NULL); - else + if (*stdinbuf) { + g_autofree char *oldbuf = g_steal_pointer(stdinbuf); + *stdinbuf = g_strconcat(oldbuf, "\n", input, NULL); + } else { *stdinbuf = g_strdup(input); + } } typedef virCommand * (*MdevctlCmdFunc)(virNodeDeviceDef *, char **, char **); @@ -188,6 +190,7 @@ testMdevctlModify(const void *data G_GNUC_UNUSED) int ret = -1; g_autoptr(virCommand) definedcmd = NULL; g_autoptr(virCommand) livecmd = NULL; + g_autoptr(virCommand) livecmd_update = NULL; g_autoptr(virCommand) bothcmd = NULL; g_autofree char *errmsg = NULL; g_autofree char *stdinbuf = NULL; @@ -222,10 +225,10 @@ testMdevctlModify(const void *data G_GNUC_UNUSED) &parser_callbacks, NULL, false))) goto cleanup; - if (!(livecmd = nodeDeviceGetMdevctlModifyCommand(def_update, false, true, &errmsg))) + if (!(livecmd_update = nodeDeviceGetMdevctlModifyCommand(def_update, false, true, &errmsg))) goto cleanup; - if (virCommandRun(livecmd, NULL) < 0) + if (virCommandRun(livecmd_update, NULL) < 0) goto cleanup; if (!(livecmd = nodeDeviceGetMdevctlModifyCommand(def, false, true, &errmsg)))