commit 66b24004345ff8a688e8548409b0b7d5a8902232
author Andy Hung <hunga@google.com> Fri Aug 28 21:39:52 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 28 21:39:52 2015 +0000
tree 96121fe5bc2dcfbeb6962a760c7f63c7dc4e286f
parent e1dc15ecfaa5bbbda28647749bad51e6d18d0c79
parent 0ea9e2761a04c4f592d854dbde2749395735fe56

am 0ea9e276: am 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev

* commit '0ea9e2761a04c4f592d854dbde2749395735fe56':
  libmedia: clear reply data for IEffect command

media/libmedia/IEffect.cpp

diff --git a/media/libmedia/IEffect.cpp b/media/libmedia/IEffect.cpp
index b94012a..431cf87 100644
--- a/media/libmedia/IEffect.cpp
+++ b/media/libmedia/IEffect.cpp
@@ -154,14 +154,14 @@
             uint32_t cmdSize = data.readInt32();
             char *cmd = NULL;
             if (cmdSize) {
-                cmd = (char *)malloc(cmdSize);
+                cmd = (char *)calloc(cmdSize, 1);
                 data.read(cmd, cmdSize);
             }
             uint32_t replySize = data.readInt32();
             uint32_t replySz = replySize;
             char *resp = NULL;
             if (replySize) {
-                resp = (char *)malloc(replySize);
+                resp = (char *)calloc(replySize, 1);
             }
             status_t status = command(cmdCode, cmdSize, cmd, &replySz, resp);
             reply->writeInt32(status);