commit 4554ffd7a1c4bc6973c11c00f5a19aa260e18100
author Jeff Tinker <jtinker@google.com> Thu Sep 17 17:28:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 17 17:28:47 2015 +0000
tree f060c7688a407b2d2ba92ac03ffc56b0758f8ca5
parent 52b829cbc2cb947733f312211a007ecd2f9fe96b
parent 6272fa1baf361a6a89607243638cc592047947b3

am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev

* commit '6272fa1baf361a6a89607243638cc592047947b3':
  DO NOT MERGE Fix vulnerability in mediaserver

media/libmedia/ICrypto.cpp

diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp
index 2053c45..918d725 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 = (void *)data.readIntPtr();
             } else {
                 dstPtr = malloc(totalSize);
+                memset(dstPtr, 0, totalSize);
             }
 
             AString errorDetailMsg;