diff options
author | Andy Hung <hunga@google.com> | 2015-08-28 21:48:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-28 21:48:10 +0000 |
commit | 6b203f06b969ba92181dbf781544b40cc2c41b7c (patch) | |
tree | 96121fe5bc2dcfbeb6962a760c7f63c7dc4e286f /media/libmedia | |
parent | 4e861bf5d43eae00ae4cb8727c5a408c3728288b (diff) | |
parent | 66b24004345ff8a688e8548409b0b7d5a8902232 (diff) | |
download | frameworks_av-6b203f06b969ba92181dbf781544b40cc2c41b7c.zip frameworks_av-6b203f06b969ba92181dbf781544b40cc2c41b7c.tar.gz frameworks_av-6b203f06b969ba92181dbf781544b40cc2c41b7c.tar.bz2 |
am 66b24004: am 0ea9e276: am 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '66b24004345ff8a688e8548409b0b7d5a8902232':
libmedia: clear reply data for IEffect command
Diffstat (limited to 'media/libmedia')
-rw-r--r-- | media/libmedia/IEffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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); |