ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Graphics:Add error check when create GraphicBuffer

Browse Source 
Change-Id: Ib0ca59bf1dfe4ae0266c29c91c1dbe3d02c0904e
Author: Lingyun Zhu <lingyun.zhu@intel.com>
Signed-off-by: Lingyun Zhu <lingyun.zhu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 50141
This commit is contained in:
Lingyun Zhu 2012-11-20 19:24:35 +08:00 committed by Jesse Hall
parent 046b72fc5d
commit 2aff702548
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/gui/IGraphicBufferProducer.cpp
View File

@ -62,7 +62,11 @@ public:
bool nonNull = reply.readInt32(); bool nonNull = reply.readInt32();
if (nonNull) { if (nonNull) {
*buf = new GraphicBuffer(); *buf = new GraphicBuffer();
reply.read(**buf); result = reply.read(**buf);
if(result != NO_ERROR) {
(*buf).clear();
return result;
}
} }
result = reply.readInt32(); result = reply.readInt32();
return result; return result;

2
libs/ui/GraphicBuffer.cpp
View File

@ -281,6 +281,8 @@ status_t GraphicBuffer::unflatten(void const* buffer, size_t size,
if (handle != 0) { if (handle != 0) {
status_t err = mBufferMapper.registerBuffer(handle); status_t err = mBufferMapper.registerBuffer(handle);
if (err != NO_ERROR) { if (err != NO_ERROR) {
width = height = stride = format = usage = 0;
handle = NULL;
ALOGE("unflatten: registerBuffer failed: %s (%d)", ALOGE("unflatten: registerBuffer failed: %s (%d)",
strerror(-err), err); strerror(-err), err);
return err; return err;