summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pablo Ceballos <pceballos@google.com> 2016-03-18 22:06:29 +0000
committer android-build-merger <android-build-merger@google.com> 2016-03-18 22:06:29 +0000
commitb2428c71c20a2e67a257eba540e6de2ca0fbae22 (patch)
treedd4e54aa1d891e2791595dd3a5f203ea8a3ee3a9
parenta3def43d3c98a17468c7cdb33777372746f07b5d (diff)
parent46da9385ad96fb1c2baab64fdea01eb3b0b41dd0 (diff)
BQ: fix some uninitialized variables am: 93c617f am: f16b857 am: 1ed2469
am: 46da938 * commit '46da9385ad96fb1c2baab64fdea01eb3b0b41dd0': BQ: fix some uninitialized variables
-rw-r--r--libs/gui/IGraphicBufferConsumer.cpp2
-rw-r--r--libs/gui/IGraphicBufferProducer.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/IGraphicBufferConsumer.cpp b/libs/gui/IGraphicBufferConsumer.cpp
index c4660bad89..7ae82e0561 100644
--- a/libs/gui/IGraphicBufferConsumer.cpp
+++ b/libs/gui/IGraphicBufferConsumer.cpp
@@ -349,7 +349,7 @@ status_t BnGraphicBufferConsumer::onTransact(
}
case GET_RELEASED_BUFFERS: {
CHECK_INTERFACE(IGraphicBufferConsumer, data, reply);
- uint64_t slotMask;
+ uint64_t slotMask = 0;
status_t result = getReleasedBuffers(&slotMask);
reply->writeInt64(static_cast<int64_t>(slotMask));
reply->writeInt32(result);
diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 1099c84f85..c3c62358fa 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -435,6 +435,7 @@ status_t BnGraphicBufferProducer::onTransact(
QueueBufferOutput* const output =
reinterpret_cast<QueueBufferOutput *>(
reply->writeInplace(sizeof(QueueBufferOutput)));
+ memset(output, 0, sizeof(QueueBufferOutput));
status_t res = connect(listener, api, producerControlledByApp, output);
reply->writeInt32(res);
return NO_ERROR;