summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2015-08-28 21:56:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-28 21:56:32 +0000
commitdbf995cecdbfcb74437cf2b6b123b10821371f82 (patch)
tree45a13ca8004b82814d020f73d68611330eab081c /media/libmedia
parent608c349d611e03e0143c23c3f77ddc62b137e354 (diff)
parent6b203f06b969ba92181dbf781544b40cc2c41b7c (diff)
downloadframeworks_av-dbf995cecdbfcb74437cf2b6b123b10821371f82.zip
frameworks_av-dbf995cecdbfcb74437cf2b6b123b10821371f82.tar.gz
frameworks_av-dbf995cecdbfcb74437cf2b6b123b10821371f82.tar.bz2
am 6b203f06: am 66b24004: am 0ea9e276: am 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '6b203f06b969ba92181dbf781544b40cc2c41b7c': libmedia: clear reply data for IEffect command
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/IEffect.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/IEffect.cpp b/media/libmedia/IEffect.cpp
index c2fff78..9ab4484 100644
--- a/media/libmedia/IEffect.cpp
+++ b/media/libmedia/IEffect.cpp
@@ -154,14 +154,14 @@ status_t BnEffect::onTransact(
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);