summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorJun Jiang <jun.a.jiang@intel.com>2014-04-29 14:15:36 +0800
committerJun Jiang <jun.a.jiang@intel.com>2014-04-29 14:15:36 +0800
commite2d1157381b863a94ccb36a1c6d70cad47e79c1a (patch)
tree8b5713c9eff60cc26a314e772a4ab4d18657357f /libs/ui
parent108ed9fa946ec516c0d853927c76ebbfca1dcb23 (diff)
downloadframeworks_native-e2d1157381b863a94ccb36a1c6d70cad47e79c1a.zip
frameworks_native-e2d1157381b863a94ccb36a1c6d70cad47e79c1a.tar.gz
frameworks_native-e2d1157381b863a94ccb36a1c6d70cad47e79c1a.tar.bz2
fix GraphicBuffer::flatten crash issue when handle is null
Change-Id: I0d3727e4366cac355791e52cb7790bf8f3c51527 Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
Diffstat (limited to 'libs/ui')
-rw-r--r--libs/ui/GraphicBuffer.cpp6
1 files changed, 4 insertions, 2 deletions
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 @@ status_t GraphicBuffer::flatten(void*& buffer, size_t& size, int*& fds, size_t&
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;
}