External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-31 10:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuagenttest: Don't leak virTypedParameter on failure

Browse Source 
There are two functions (testQemuAgentOSInfo() and
testQemuAgentTimezone()) which call virTypedParamsFree() only in
successful paths. If an error is met then those parameters would
be leaked. Fix this by placing the virTypedParamsFree() calls on
better place.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
This commit is contained in:
Michal Privoznik 2021-11-01 10:34:33 +01:00
parent 061b691cff
commit ac35a9fca2
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/qemuagenttest.c
View File

@ -1371,12 +1371,12 @@ testQemuAgentOSInfo(const void *data)
VALIDATE_PARAM("os.kernel-release", "7601");
VALIDATE_PARAM("os.kernel-version", "6.1");
VALIDATE_PARAM("os.machine", "x86_64");
virTypedParamsFree(params, nparams);
ret = 0;
cleanup:
qemuMonitorTestFree(test);
virTypedParamsFree(params, nparams);
return ret;
}
@ -1394,6 +1394,8 @@ testQemuAgentTimezone(const void *data)
{
virDomainXMLOption *xmlopt = (virDomainXMLOption *)data;
qemuMonitorTest *test = qemuMonitorTestNewAgent(xmlopt);
virTypedParameterPtr params = NULL;
int nparams = 0;
int ret = -1;
if (!test)
@ -1401,8 +1403,6 @@ testQemuAgentTimezone(const void *data)
#define VALIDATE_TIMEZONE(response_, expected_name_, expected_offset_) \
do { \
virTypedParameterPtr params_ = NULL; \
int nparams_ = 0; \
int maxparams_ = 0; \
const char *name_ = NULL; \
int offset_; \
@ -1411,15 +1411,18 @@ testQemuAgentTimezone(const void *data)
if (qemuMonitorTestAddItem(test, "guest-get-timezone", \
response_) < 0) \
goto cleanup; \
virTypedParamsFree(params, nparams); \
params = NULL; \
nparams = 0; \
if (qemuAgentGetTimezone(qemuMonitorTestGetAgent(test), \
&params_, &nparams_, &maxparams_, true) < 0) \
&params, &nparams, &maxparams_, true) < 0) \
goto cleanup; \
if (nparams_ != 2) { \
if (nparams != 2) { \
virReportError(VIR_ERR_INTERNAL_ERROR, \
"Expected 2 params, got %d", nparams_); \
"Expected 2 params, got %d", nparams); \
goto cleanup; \
} \
if (virTypedParamsGetString(params_, nparams_, \
if (virTypedParamsGetString(params, nparams, \
"timezone.name", &name_) < 0) { \
virReportError(VIR_ERR_INTERNAL_ERROR, "missing param '%s'", \
"tiemzone.name"); \
@ -1430,7 +1433,7 @@ testQemuAgentTimezone(const void *data)
"Expected name '%s', got '%s'", expected_name_, name_); \
goto cleanup; \
} \
if (virTypedParamsGetInt(params_, nparams_, \
if (virTypedParamsGetInt(params, nparams, \
"timezone.offset", &offset_) < 0) { \
virReportError(VIR_ERR_INTERNAL_ERROR, "missing param '%s'", \
"tiemzone.offset"); \
@ -1442,7 +1445,6 @@ testQemuAgentTimezone(const void *data)
expected_offset_); \
goto cleanup; \
} \
virTypedParamsFree(params_, nparams_); \
} while (0)
VALIDATE_TIMEZONE(testQemuAgentTimezoneResponse1, "IST", 19800);
@ -1454,6 +1456,7 @@ testQemuAgentTimezone(const void *data)
cleanup:
qemuMonitorTestFree(test);
virTypedParamsFree(params, nparams);
return ret;
}
static int