External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 14:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

vboxDumpDisplay: check return of virDomainGraphicsListenSetAddress

Browse Source 
Error out if the allocation failed.
This commit is contained in:
Ján Tomko 2016-02-05 17:33:52 +01:00
parent fcecbb37bf
commit ec74a9da7a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vbox/vbox_common.c
View File

@ -3303,6 +3303,7 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
PRUnichar *keyTypeUtf16 = NULL; PRUnichar *keyTypeUtf16 = NULL;
PRUnichar *valueTypeUtf16 = NULL; PRUnichar *valueTypeUtf16 = NULL;
char *valueTypeUtf8 = NULL; char *valueTypeUtf8 = NULL;
char *netAddressUtf8 = NULL;
IVRDxServer *VRDxServer = NULL; IVRDxServer *VRDxServer = NULL;
PRBool VRDxEnabled = PR_FALSE; PRBool VRDxEnabled = PR_FALSE;
virDomainGraphicsDefPtr graphics = NULL; virDomainGraphicsDefPtr graphics = NULL;
@ -3377,7 +3378,6 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
if (VRDxEnabled) { if (VRDxEnabled) {
PRUnichar *netAddressUtf16 = NULL; PRUnichar *netAddressUtf16 = NULL;
char *netAddressUtf8 = NULL;
PRBool allowMultiConnection = PR_FALSE; PRBool allowMultiConnection = PR_FALSE;
PRBool reuseSingleConnection = PR_FALSE; PRBool reuseSingleConnection = PR_FALSE;
@ -3391,13 +3391,14 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
gVBoxAPI.UIVRDxServer.GetNetAddress(data, VRDxServer, &netAddressUtf16); gVBoxAPI.UIVRDxServer.GetNetAddress(data, VRDxServer, &netAddressUtf16);
if (netAddressUtf16) { if (netAddressUtf16) {
VBOX_UTF16_TO_UTF8(netAddressUtf16, &netAddressUtf8); VBOX_UTF16_TO_UTF8(netAddressUtf16, &netAddressUtf8);
if (STRNEQ(netAddressUtf8, ""))
virDomainGraphicsListenSetAddress(graphics, 0,
netAddressUtf8, -1, true);
VBOX_UTF16_FREE(netAddressUtf16); VBOX_UTF16_FREE(netAddressUtf16);
VBOX_UTF8_FREE(netAddressUtf8);
} }
if (STRNEQ_NULLABLE(netAddressUtf8, "") &&
virDomainGraphicsListenSetAddress(graphics, 0,
netAddressUtf8, -1, true) < 0)
goto cleanup;
gVBoxAPI.UIVRDxServer.GetAllowMultiConnection(VRDxServer, &allowMultiConnection); gVBoxAPI.UIVRDxServer.GetAllowMultiConnection(VRDxServer, &allowMultiConnection);
if (allowMultiConnection) if (allowMultiConnection)
graphics->data.rdp.multiUser = true; graphics->data.rdp.multiUser = true;
@ -3419,6 +3420,7 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
cleanup: cleanup:
VBOX_RELEASE(VRDxServer); VBOX_RELEASE(VRDxServer);
VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(valueTypeUtf8);
VBOX_UTF8_FREE(netAddressUtf8);
virDomainGraphicsDefFree(graphics); virDomainGraphicsDefFree(graphics);
return ret; return ret;
} }