From 3b1a5dde7989deaac3df40ef35ebc844d311e42a Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 14 May 2019 17:05:45 +0200 Subject: [PATCH] test_driver: Don't access @vm after it was set to NULL If something goes wrong in testDomainGetDiskErrors() then we try to free any strings that were previously allocated in return array. Problem is, in my review of original patch (89320788ac4) I've mistakenly did some changes which result in possible NULL dereference (@vm is set to NULL as the first thing under cleanup label). Signed-off-by: Michal Privoznik Reviewed-by: Andrea Bolognani --- src/test/test_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4b1f2724a0..e3545e7085 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3268,7 +3268,7 @@ static int testDomainGetDiskErrors(virDomainPtr dom, virCheckFlags(0, -1); if (!(vm = testDomObjFromDomain(dom))) - goto cleanup; + return -1; if (virDomainObjCheckActive(vm) < 0) goto cleanup; @@ -3285,11 +3285,11 @@ static int testDomainGetDiskErrors(virDomainPtr dom, } cleanup: - virDomainObjEndAPI(&vm); if (ret < 0) { for (i = 0; i < MIN(vm->def->ndisks, maxerrors); i++) VIR_FREE(errors[i].disk); } + virDomainObjEndAPI(&vm); return ret; } -- GitLab