From 57668786d8bc5486e86ce701421b5ba07b9c7053 Mon Sep 17 00:00:00 2001 From: Nicolas Silva Date: Thu, 17 Mar 2016 14:59:12 +0100 Subject: [PATCH] Bug 1256045 - Add a null-check in BufferTextureHost::EnsureWrappingTextureSource. r=jnicol --- gfx/layers/composite/TextureHost.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gfx/layers/composite/TextureHost.cpp b/gfx/layers/composite/TextureHost.cpp index 4469eb562838..fb2897f1540e 100644 --- a/gfx/layers/composite/TextureHost.cpp +++ b/gfx/layers/composite/TextureHost.cpp @@ -516,6 +516,16 @@ BufferTextureHost::EnsureWrappingTextureSource() } mFirstSource = mCompositor->CreateDataTextureSourceAround(surf); + if (!mFirstSource) { + // BasicCompositor::CreateDataTextureSourceAround never returns null + // and we don't expect to take this branch if we are using another backend. + // Returning false is fine but if we get into this situation it probably + // means something fishy is going on, like a texture being used with + // several compositor backends. + NS_WARNING("Failed to use a BufferTextureHost without intermediate buffer"); + return false; + } + mFirstSource->SetUpdateSerial(mUpdateSerial); mFirstSource->SetOwner(this);