diff options
author | Andy Hung <hunga@google.com> | 2015-09-03 18:05:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 18:05:43 +0000 |
commit | 52a4fc09b483a20ee7d5970be01598ee262f7088 (patch) | |
tree | 6df9c8ad33bffec0266be615e0162b15fcbe5e49 /media/libmedia | |
parent | 7d34959b10e0e8a9ac4cdd5e10a6d016513aa03f (diff) | |
parent | 3732a3acafa7eb621bc26cca3eb00150ea12d2e2 (diff) | |
download | frameworks_av-52a4fc09b483a20ee7d5970be01598ee262f7088.zip frameworks_av-52a4fc09b483a20ee7d5970be01598ee262f7088.tar.gz frameworks_av-52a4fc09b483a20ee7d5970be01598ee262f7088.tar.bz2 |
am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '3732a3acafa7eb621bc26cca3eb00150ea12d2e2':
Make IEffect command more robust (second try)
Diffstat (limited to 'media/libmedia')
-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 431cf87..8cd158d 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); |