Bug 1109828 - Check for null pointer before dereferencing. r=nical

2014-12-10 15:11:45 -05:00
parent 414bb43833
commit 2e9075adb9
1 changed files with 7 additions and 1 deletions
--- a/gfx/layers/client/TextureClientPool.cpp
+++ b/gfx/layers/client/TextureClientPool.cpp
@@ -48,6 +48,10 @@ static bool TestClientPool(const char* what,
                           TextureClient* aClient,
                           TextureClientPool* aPool)
 {
+  if (!aClient || !aPool) {
+    return false;
+  }
+
  TextureClientPool* actual = aClient->mPoolTracker;
  bool ok = (actual == aPool);
  if (ok) {
@@ -105,7 +109,9 @@ TextureClientPool::GetTextureClient()

  mOutstandingClients++;
 #ifdef GFX_DEBUG_TRACK_CLIENTS_IN_POOL
-  textureClient->mPoolTracker = this;
+  if (textureClient) {
+    textureClient->mPoolTracker = this;
+  }
 #endif
  return textureClient;
 }