commit 9fdfa60aaf477cc944013b637a2a35d357d4340f
author Jesse Hall <jessehall@google.com> Mon May 05 22:51:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 05 22:51:27 2014 +0000
tree e62d9fe25a89de67dc32bad96da00e2cf2c9c92b
parent 57fdbbda2c475d2abdd828177f942ddb6d164bef
parent 424b093a58c9f428081da991afa347183bf07847

am 424b093a: am ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null"

* commit '424b093a58c9f428081da991afa347183bf07847':
  fix GraphicBuffer::flatten crash issue when handle is null

libs/ui/GraphicBuffer.cpp

diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
index 96a7188..c4e4efa 100644
--- a/libs/ui/GraphicBuffer.cpp
+++ b/libs/ui/GraphicBuffer.cpp
@@ -235,8 +235,10 @@
 
     buffer = reinterpret_cast<void*>(static_cast<int*>(buffer) + sizeNeeded);
     size -= sizeNeeded;
-    fds += handle->numFds;
-    count -= handle->numFds;
+    if (handle) {
+        fds += handle->numFds;
+        count -= handle->numFds;
+    }
 
     return NO_ERROR;
 }