External/libvirt
1
0
Fork 0
Code

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