]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
vbox: Use g_autofree in vboxDomainScreenshot()
authorFabiano Fidêncio <fidencio@redhat.com>
Thu, 19 Dec 2019 08:48:05 +0000 (09:48 +0100)
committerFabiano Fidêncio <fidencio@redhat.com>
Fri, 20 Dec 2019 08:38:43 +0000 (09:38 +0100)
This also fixes a cacheDir's leak when g_mkstep_full() fails.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/vbox/vbox_common.c

index 5957ae52c42e2ac0763c60b58bb13a27ba595a40..586937fa19dc4d1f4eadb4f1053cdfaa1c2d39e8 100644 (file)
@@ -7341,8 +7341,8 @@ vboxDomainScreenshot(virDomainPtr dom,
     vboxIID iid;
     IMachine *machine = NULL;
     nsresult rc;
-    char *tmp;
-    char *cacheDir;
+    g_autofree char *tmp = NULL;
+    g_autofree char *cacheDir = NULL;
     int tmp_fd = -1;
     unsigned int max_screen;
     bool privileged = geteuid() == 0;
@@ -7383,7 +7383,6 @@ vboxDomainScreenshot(virDomainPtr dom,
 
     if ((tmp_fd = g_mkstemp_full(tmp, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR)) == -1) {
         virReportSystemError(errno, _("g_mkstemp(\"%s\") failed"), tmp);
-        VIR_FREE(tmp);
         VBOX_RELEASE(machine);
         return NULL;
     }
@@ -7454,8 +7453,6 @@ vboxDomainScreenshot(virDomainPtr dom,
 
     VIR_FORCE_CLOSE(tmp_fd);
     unlink(tmp);
-    VIR_FREE(tmp);
-    VIR_FREE(cacheDir);
     VBOX_RELEASE(machine);
     vboxIIDUnalloc(&iid);
     return ret;