From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 29 Sep 2017 19:52:44 +0000 (-0700)
Subject: If for some reason RandR12GetInfo failed to return RandR12Info,
X-Git-Tag: 10.1.15~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce1709a23f52b55c912abfb82ef767d8a9dfc8e1;p=thirdparty%2Fopen-vm-tools.git

If for some reason RandR12GetInfo failed to return RandR12Info,
it should not follow the cleanup path to free it. Instead it
should return FALSE.
---

diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c b/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c
index 84b788b7e..f9221254a 100644
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c
@@ -1000,7 +1000,7 @@ RandR12_SetTopology(Display *dpy,           // IN/OUT: The display connection
    info = RandR12GetInfo(dpy, rootWin);
    if (!info) {
       g_warning("%s: Setup info struct failed.\n", __func__);
-      goto out_ungrab;
+      return FALSE;
    }
 
    RandR12GetDpi(dpy, screen, info);