commit 6df676a0f2ab1244b7034cd6e15d9a03c7fceaee
author Hridya Valsaraju <hridya@google.com> Mon Mar 27 21:26:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 27 21:26:40 2017 +0000
tree 725100ad9dffc5cacfe850b0e8d9899bc007dcdb
parent 434bcde4a00ec5e310177f08ef6a53868fc8f983
parent 4930eddb55ca6ebf7794d3f8c7552df924a89107

Fix buffer overflow issue in FMQ unit test
am: 4930eddb55

Change-Id: I002650ed580b72cdc040275e9e8525935df8bda4

tests/msgq_test_client.cpp

diff --git a/tests/msgq_test_client.cpp b/tests/msgq_test_client.cpp
index a496d62..c15035b 100644
--- a/tests/msgq_test_client.cpp
+++ b/tests/msgq_test_client.cpp
@@ -237,7 +237,7 @@
  */
 TEST_F(SynchronizedReadWriteClient, BlockingReadWrite2) {
     const size_t dataLen = 64;
-    uint16_t data[dataLen] = {0};
+    std::vector<uint16_t> data(mNumMessagesMax);
 
     /*
      * Request service to perform a blocking read using default EventFlag
@@ -249,7 +249,7 @@
     /* Cause a context switch to allow service to block */
     sched_yield();
 
-    bool ret = mQueue->writeBlocking(data,
+    bool ret = mQueue->writeBlocking(&data[0],
                                      dataLen);
     ASSERT_TRUE(ret);
 
@@ -257,7 +257,7 @@
      * If the blocking read was successful, another write of size
      * mNumMessagesMax will succeed.
      */
-    ret = mQueue->writeBlocking(data, mNumMessagesMax, 5000000000 /* timeOutNanos */);
+    ret = mQueue->writeBlocking(&data[0], mNumMessagesMax, 5000000000 /* timeOutNanos */);
     ASSERT_TRUE(ret);
 }