Changeset 54860 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Mar 20, 2015 9:56:49 AM (10 years ago)

Author:

vboxsync

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

99070

Message:

Host 3D: fix memory leak in crServer.

File:

• trunk/src/VBox/GuestHost/OpenGL/util/compositor.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/util/compositor.cpp

@@ -557 +557 @@
 
     rc = crVrScrCompositorEntryRegionsSet(pCompositor, pEntry, cRegions, paRegions, &fChanged);
-    if (RT_FAILURE(rc))
-    {
+    if (RT_SUCCESS(rc))
+    {
+        if (fChanged && CrVrScrCompositorEntryIsUsed(pEntry))
+        {
+            rc = crVrScrCompositorEntryEnsureRegionsBounds(pCompositor, pEntry, NULL);
+            if (RT_SUCCESS(rc))
+            {
+                if (pfChanged)
+                    *pfChanged = fPosChanged || fChanged || fWasInList;
+            }
+            else
+                WARN(("crVrScrCompositorEntryEnsureRegionsBounds failed, rc %d", rc));
+        }
+
+    }
+    else
         WARN(("crVrScrCompositorEntryRegionsSet failed, rc %d", rc));
-        return rc;
-    }
-
-    if (fChanged && CrVrScrCompositorEntryIsUsed(pEntry))
-    {
-        rc = crVrScrCompositorEntryEnsureRegionsBounds(pCompositor, pEntry, NULL);
-        if (RT_FAILURE(rc))
-        {
-            WARN(("crVrScrCompositorEntryEnsureRegionsBounds failed, rc %d", rc));
-            return rc;
-        }
-    }
-
-    if (pfChanged)
-        *pfChanged = fPosChanged || fChanged || fWasInList;
-
-    return VINF_SUCCESS;
+
+    if (paTranslatedRects)
+        RTMemFree(paTranslatedRects);
+
+    return rc;
 }