Changeset 89603 in vbox

Timestamp:

Jun 10, 2021 1:34:13 PM (3 years ago)

Author:

vboxsync

Message:

Additions: X11: VMSVGA: prevent memory leak when accessing display name on resize, bugref#10028.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -538 +538 @@
         for (int i = 0; i < iMonitorCount; ++i)
         {
-            int iMonitorID = getMonitorIdFromName(XGetAtomName(x11Context.pDisplayRandRMonitoring, pMonitorInfo[i].name));
+            char *pszMonitorName = XGetAtomName(x11Context.pDisplayRandRMonitoring, pMonitorInfo[i].name);
+            if (!pszMonitorName)
+            {
+                VBClLogError("queryMonitorPositions: skip monitor with unknown name %d\n", i);
+                continue;
+            }
+
+            int iMonitorID = getMonitorIdFromName(pszMonitorName);
+            XFree((void *)pszMonitorName);
+            pszMonitorName = NULL;
+
             if (iMonitorID >= x11Context.hOutputCount || iMonitorID == -1)
             {
-                VBClLogInfo("queryMonitorPositions: skip monitor %d (id %d, %s) (w,h)=(%d,%d) (x,y)=(%d,%d)\n",
-                        i, iMonitorID, XGetAtomName(x11Context.pDisplayRandRMonitoring, pMonitorInfo[i].name),
+                VBClLogInfo("queryMonitorPositions: skip monitor %d (id %d) (w,h)=(%d,%d) (x,y)=(%d,%d)\n",
+                        i, iMonitorID,
                         pMonitorInfo[i].width, pMonitorInfo[i].height,
                         pMonitorInfo[i].x, pMonitorInfo[i].y);