commit e81a4f15185486cd67ff8983f9826d42ef653088
author Casey Dahlin <sadmac@google.com> Tue Nov 15 23:40:20 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 15 23:40:20 2016 +0000
tree e1563c9d8ac3b9035ccbf6534f2f4b523859c127
parent b17adaa85f8bd7112c0efb872ce461aaf70f73ef
parent 65a8f07e57a492289798ca709a311650b5bd5af1

Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev

libs/gui/BufferQueueConsumer.cpp

diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp
index 525938e..96f7829 100644
--- a/libs/gui/BufferQueueConsumer.cpp
+++ b/libs/gui/BufferQueueConsumer.cpp
@@ -714,6 +714,7 @@
 }
 
 sp<NativeHandle> BufferQueueConsumer::getSidebandStream() const {
+    Mutex::Autolock lock(mCore->mMutex);
     return mCore->mSidebandStream;
 }
 

libs/gui/BufferQueueProducer.cpp

diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index 234a863..09e7cb6 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -1333,6 +1333,7 @@
 
 String8 BufferQueueProducer::getConsumerName() const {
     ATRACE_CALL();
+    Mutex::Autolock lock(mCore->mMutex);
     BQ_LOGV("getConsumerName: %s", mConsumerName.string());
     return mConsumerName;
 }