From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 11 Jun 2020 08:38:05 +0000 (+0200)
Subject: vboxDomainScreenshot: Don't pass uninitialized 'screenData' to VIR_FREE
X-Git-Tag: v6.5.0-rc1~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515e62b32b623325e8c4f7760c5bccaef0972b4a;p=thirdparty%2Flibvirt.git

vboxDomainScreenshot: Don't pass uninitialized 'screenData' to VIR_FREE

If one of the early checks to get screen resolution fails 'screenData'
would be passed to VIR_FREE uninitialized. Unfortunately the compiler
isn't able to detect this when VIR_FREE is implemented using
g_clear_pointer.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com
---

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index a834a971f0..85935ba731 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -7418,7 +7418,7 @@ vboxDomainScreenshot(virDomainPtr dom,
             if (display) {
                 PRUint32 width, height, bitsPerPixel;
                 PRUint32 screenDataSize;
-                PRUint8 *screenData;
+                PRUint8 *screenData = NULL;
                 PRInt32 xOrigin, yOrigin;
 
                 rc = gVBoxAPI.UIDisplay.GetScreenResolution(display, screen,