commit b4eac742c9e3f0238d5d03b237b2038df885ed2c
author Pablo Ceballos <pceballos@google.com> Fri Mar 18 17:52:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 18 17:52:56 2016 +0000
tree 9b5ffa62c7adccee61cc84caac2c14070341c76f
parent 24cd2b96279ac29b936ba09ed708b1bcb922d04c
parent 030172e49c866943203e4906b26e1a132ff94ff4

Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev

libs/gui/IGraphicBufferConsumer.cpp

diff --git a/libs/gui/IGraphicBufferConsumer.cpp b/libs/gui/IGraphicBufferConsumer.cpp
index 9574b61..ea98296 100644
--- a/libs/gui/IGraphicBufferConsumer.cpp
+++ b/libs/gui/IGraphicBufferConsumer.cpp
@@ -410,7 +410,7 @@
         } break;
         case GET_RELEASED_BUFFERS: {
             CHECK_INTERFACE(IGraphicBufferConsumer, data, reply);
-            uint32_t slotMask;
+            uint32_t slotMask = 0;
             status_t result = getReleasedBuffers(&slotMask);
             reply->writeInt32(slotMask);
             reply->writeInt32(result);

libs/gui/IGraphicBufferProducer.cpp

diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index e713c04..6549a0c 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -249,6 +249,7 @@
             QueueBufferOutput* const output =
                     reinterpret_cast<QueueBufferOutput *>(
                             reply->writeInplace(sizeof(QueueBufferOutput)));
+            memset(output, 0, sizeof(QueueBufferOutput));
             status_t res = connect(token, api, producerControlledByApp, output);
             reply->writeInt32(res);
             return NO_ERROR;