commit fc43e16a5693bca0edfc82c650fb606971e47138
author Jesse Hall <jessehall@google.com> Tue Aug 13 19:02:56 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 13 19:02:56 2013 +0000
tree f598dd6c837fb1a52c63ee48de89871b299a9d94
parent 046b72fc5d93aae3b47b88b9f6683512d01d75d0
parent 2aff7025482cc40d2ebd45f81cdb318ac1c6f868

Merge "Graphics:Add error check when create GraphicBuffer"

libs/gui/IGraphicBufferProducer.cpp

diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 63d7628..c335439 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -62,7 +62,11 @@
         bool nonNull = reply.readInt32();
         if (nonNull) {
             *buf = new GraphicBuffer();
-            reply.read(**buf);
+            result = reply.read(**buf);
+            if(result != NO_ERROR) {
+                (*buf).clear();
+                return result;
+            }
         }
         result = reply.readInt32();
         return result;

libs/ui/GraphicBuffer.cpp

diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
index 580788d..83ae469 100644
--- a/libs/ui/GraphicBuffer.cpp
+++ b/libs/ui/GraphicBuffer.cpp
@@ -281,6 +281,8 @@
     if (handle != 0) {
         status_t err = mBufferMapper.registerBuffer(handle);
         if (err != NO_ERROR) {
+            width = height = stride = format = usage = 0;
+            handle = NULL;
             ALOGE("unflatten: registerBuffer failed: %s (%d)",
                     strerror(-err), err);
             return err;