Bug 678982 - check for null pointer dereference in gfx/layers/d3d10/ImageLayerD3D10.cpp; r=bas.schouten

gfx/layers/d3d10/ImageLayerD3D10.cpp

@@ -50,7 +50,11 @@ SurfaceToTexture(ID3D10Device *aDevice,
                  gfxASurface *aSurface,
                  const gfxIntSize &aSize)
 {
-  if (aSurface && aSurface->GetType() == gfxASurface::SurfaceTypeD2D) {
+  if (!aSurface) {
+    return NULL;
+  }
+
+  if (aSurface->GetType() == gfxASurface::SurfaceTypeD2D) {
     void *data = aSurface->GetData(&gKeyD3D10Texture);
     if (data) {
       nsRefPtr<ID3D10Texture2D> texture = static_cast<ID3D10Texture2D*>(data);