commit 75f0b792547f699761cb2b538b1dc1d020567238
author Jeff Tinker <jtinker@google.com> Thu Sep 17 17:20:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 17 17:20:42 2015 +0000
tree 600ae3207949898e61011fedadd6cbfa628df4fe
parent 4296d7df2a626f3340c2b829b5fcf2e8b2f79540
parent dffe5cdb436987a65a9010460979507c06b5c904

am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev

* commit 'dffe5cdb436987a65a9010460979507c06b5c904':
  DO NOT MERGE Fix vulnerability in mediaserver

media/libmedia/ICrypto.cpp

diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp
index 9703b0d..a398ff7 100644
--- a/media/libmedia/ICrypto.cpp
+++ b/media/libmedia/ICrypto.cpp
@@ -297,7 +297,7 @@
             if (secure) {
                 secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));
             } else {
-                dstPtr = malloc(totalSize);
+                dstPtr = calloc(1, totalSize);
             }
 
             AString errorDetailMsg;