Fix memory leak in Renderer11::getD3DTextureInfo

If the device for the texture does not match mDevice, we early out of the method without releasing textureDevice. Fixed by adding DynamicCastComObjectToComPtr and using angle::ComPtr Bug: angleproject:3761 Change-Id: Id4ef9231f8a91c30e326520132af693d51047c7d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1730175 Commit-Queue: Rafael Cintron <rafael.cintron@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix memory leak in Renderer11::getD3DTextureInfo
990990b4 · Rafael Cintron · Commit Bot · 74e7a315 · 990990b4 · 990990b4
Commit 990990b4 authored Jul 31, 2019 by Rafael Cintron Committed by Commit Bot Aug 03, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 10 deletions

Renderer11.cpp src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +8 -10

renderer11_utils.h src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h +15 -0

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
@@ -1238,30 +1238,28 @@ NativeWindowD3D *Renderer11::createNativeWindow(EGLNativeWindowType window,
 }
 egl::Error Renderer11::getD3DTextureInfo(const egl::Config *configuration,
-                                         IUnknown *d3dTexture,
+                                         IUnknown *texture,
                                         EGLint *width,
                                         EGLint *height,
                                         EGLint *samples,
                                         const angle::Format **angleFormat) const
 {
-    ID3D11Texture2D *texture = d3d11::DynamicCastComObject<ID3D11Texture2D>(d3dTexture);
+    angle::ComPtr<ID3D11Texture2D> d3dTexture =
-    if (texture == nullptr)
+        d3d11::DynamicCastComObjectToComPtr<ID3D11Texture2D>(texture);
+    if (d3dTexture == nullptr)
    {
        return egl::EglBadParameter() << "client buffer is not a ID3D11Texture2D";
    }
-    ID3D11Device *textureDevice = nullptr;
+    angle::ComPtr<ID3D11Device> textureDevice;
-    texture->GetDevice(&textureDevice);
+    d3dTexture->GetDevice(&textureDevice);
-    if (textureDevice != mDevice)
+    if (textureDevice.Get() != mDevice)
    {
-        SafeRelease(texture);
        return egl::EglBadParameter() << "Texture's device does not match.";
    }
-    SafeRelease(textureDevice);
    D3D11_TEXTURE2D_DESC desc = {0};
-    texture->GetDesc(&desc);
+    d3dTexture->GetDesc(&desc);
-    SafeRelease(texture);
    if (width)
    {

--- a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
+++ b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
@@ -190,6 +190,21 @@ outType *DynamicCastComObject(IUnknown *object)
    }
 }
+template <typename outType>
+angle::ComPtr<outType> DynamicCastComObjectToComPtr(IUnknown *object)
+{
+    angle::ComPtr<outType> outObject;
+    const HRESULT hr = object->QueryInterface(IID_PPV_ARGS(&outObject));
+    if (SUCCEEDED(hr))
+    {
+        return outObject;
+    }
+    else
+    {
+        return nullptr;
+    }
+}
 inline bool isDeviceLostError(HRESULT errorCode)
 {
    switch (errorCode)