diff options
author | Andy Hung <hunga@google.com> | 2015-09-04 18:01:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 18:01:48 +0000 |
commit | 264663c4ea0467acc0192997bceb83efd5526756 (patch) | |
tree | e693b7341305c91673e2c3ca91ea602bf2320f74 /media | |
parent | dda925c04de62f67fc1128a5c1b655df59fca138 (diff) | |
parent | 7ecf636997b812ff5ae87ea9e146707d37d1b78a (diff) | |
download | frameworks_av-264663c4ea0467acc0192997bceb83efd5526756.zip frameworks_av-264663c4ea0467acc0192997bceb83efd5526756.tar.gz frameworks_av-264663c4ea0467acc0192997bceb83efd5526756.tar.bz2 |
am 7ecf6369: am 7734e37e: am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '7ecf636997b812ff5ae87ea9e146707d37d1b78a':
Make IEffect command more robust (second try)
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/IEffect.cpp | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/media/libmedia/IEffect.cpp b/media/libmedia/IEffect.cpp index 761b243..faf5795 100644 --- a/media/libmedia/IEffect.cpp +++ b/media/libmedia/IEffect.cpp @@ -85,13 +85,15 @@ public: data.writeInt32(size); status_t status = remote()->transact(COMMAND, data, &reply); + if (status == NO_ERROR) { + status = reply.readInt32(); + } if (status != NO_ERROR) { if (pReplySize != NULL) *pReplySize = 0; return status; } - status = reply.readInt32(); size = reply.readInt32(); if (size != 0 && pReplyData != NULL && pReplySize != NULL) { reply.read(pReplyData, size); @@ -155,6 +157,10 @@ status_t BnEffect::onTransact( char *cmd = NULL; if (cmdSize) { cmd = (char *)calloc(cmdSize, 1); + if (cmd == NULL) { + reply->writeInt32(NO_MEMORY); + return NO_ERROR; + } data.read(cmd, cmdSize); } uint32_t replySize = data.readInt32(); @@ -162,15 +168,22 @@ status_t BnEffect::onTransact( char *resp = NULL; if (replySize) { resp = (char *)calloc(replySize, 1); + if (resp == NULL) { + free(cmd); + reply->writeInt32(NO_MEMORY); + return NO_ERROR; + } } status_t status = command(cmdCode, cmdSize, cmd, &replySz, resp); reply->writeInt32(status); - if (replySz < replySize) { - replySize = replySz; - } - reply->writeInt32(replySize); - if (replySize) { - reply->write(resp, replySize); + if (status == NO_ERROR) { + if (replySz < replySize) { + replySize = replySz; + } + reply->writeInt32(replySize); + if (replySize) { + reply->write(resp, replySize); + } } if (cmd) { free(cmd); |