Changeset 89609 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Jun 10, 2021 4:15:40 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145053

Message:

Additions: X11: VMSVGA: prevent memory leak on CRTC disable, bugref#10028.

File:

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

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

@@ -153 +153 @@
     XRROutputInfo* (*pXRRGetOutputInfo) (Display *, XRRScreenResources *, RROutput);
     XRRCrtcInfo* (*pXRRGetCrtcInfo) (Display *, XRRScreenResources *, RRCrtc crtc);
+    void (*pXRRFreeCrtcInfo)(XRRCrtcInfo *);
     void (*pXRRAddOutputMode)(Display *, RROutput, RRMode);
 };
@@ -838 +839 @@
     *(void **)(&x11Context.pXRRGetCrtcInfo) = dlsym(x11Context.pRandLibraryHandle, "XRRGetCrtcInfo");
     checkFunctionPtrReturn(x11Context.pXRRGetCrtcInfo);
+
+    *(void **)(&x11Context.pXRRFreeCrtcInfo) = dlsym(x11Context.pRandLibraryHandle, "XRRFreeCrtcInfo");
+    checkFunctionPtrReturn(x11Context.pXRRFreeCrtcInfo);
 
     *(void **)(&x11Context.pXRRAddOutputMode) = dlsym(x11Context.pRandLibraryHandle, "XRRAddOutputMode");
@@ -999 +1003 @@
                                            CurrentTime, 0, 0, None, RR_Rotate_0, NULL, 0);
 #endif
+
+#ifdef WITH_DISTRO_XRAND_XINERAMA
+    XRRFreeCrtcInfo(pCrctInfo);
+#else
+    if (x11Context.pXRRFreeCrtcInfo)
+        x11Context.pXRRFreeCrtcInfo(pCrctInfo);
+#endif
+
     /** @todo  In case of unsuccesful crtc config set  we have to revert frame buffer size and crtc sizes. */
     if (ret == Success)