commit 4ae700d2bd467f18e5de8b5d1579d7e20da88e36
author Jeff Tinker <jtinker@google.com> Thu Sep 17 17:21:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 17 17:21:35 2015 +0000
tree a35a0e18f78b5d4740e6f8eeae5a9f4151b9c93a
parent d83f22552372edfe67473c29a370e0a025a91f21
parent 160ed868d6beb0d55dc2194564d2f08cc9d6fbc2

am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev

* commit '160ed868d6beb0d55dc2194564d2f08cc9d6fbc2':
  DO NOT MERGE Fix vulnerability in mediaserver

media/libmedia/ICrypto.cpp

diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp
index 0d68ee7..18325c5 100644
--- a/media/libmedia/ICrypto.cpp
+++ b/media/libmedia/ICrypto.cpp
@@ -236,6 +236,7 @@
 
             size_t totalSize = data.readInt32();
             void *srcData = malloc(totalSize);
+            memset(srcData, 0, totalSize);
             data.read(srcData, totalSize);
 
             int32_t numSubSamples = data.readInt32();
@@ -252,6 +253,7 @@
                 secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));
             } else {
                 dstPtr = malloc(totalSize);
+                memset(dstPtr, 0, totalSize);
             }
 
             AString errorDetailMsg;