Bug 1305378 - Check texture is valid before creating a render target, r?mtseng draft
authorpeter chang <pchang@mozilla.com>
Fri, 30 Sep 2016 17:35:35 +0800
changeset 419413 72a98d64aa8e850a6f7971ef52b74412c4709c2b
parent 418456 b1d60f2f68c7cccc96fcf9a2075bb430a500a0f2
child 532575 74b6b5a170252ad57557f2a3064b6a04c2f46d41
push id30931
push userbmo:howareyou322@gmail.com
push dateFri, 30 Sep 2016 09:43:19 +0000
reviewersmtseng
bugs1305378
milestone52.0a1
Bug 1305378 - Check texture is valid before creating a render target, r?mtseng MozReview-Commit-ID: L4ruAMEDN9z
gfx/layers/d3d9/CompositorD3D9.cpp
--- a/gfx/layers/d3d9/CompositorD3D9.cpp
+++ b/gfx/layers/d3d9/CompositorD3D9.cpp
@@ -193,16 +193,20 @@ CompositorD3D9::CreateTexture(const gfx:
 
 already_AddRefed<CompositingRenderTarget>
 CompositorD3D9::CreateRenderTargetFromSource(const gfx::IntRect &aRect,
                                              const CompositingRenderTarget *aSource,
                                              const gfx::IntPoint &aSourcePoint)
 {
   RefPtr<IDirect3DTexture9> texture = CreateTexture(aRect, aSource, aSourcePoint);
 
+  if (!texture) {
+    return nullptr;
+  }
+
   return MakeAndAddRef<CompositingRenderTargetD3D9>(texture,
                                                     INIT_MODE_NONE,
                                                     aRect);
 }
 
 void
 CompositorD3D9::SetRenderTarget(CompositingRenderTarget *aRenderTarget)
 {