diff options
author | Andreas Huber <andih@google.com> | 2012-04-12 08:31:00 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 08:31:00 -0700 |
commit | b34364269683363ca54aeed4952937cf37da7e06 (patch) | |
tree | f6110a12bcafb9688ce54e720d74565d792588c5 | |
parent | 1fe40b374fc13c477d42b3fc59f3d21f1e552aea (diff) | |
parent | 705868c0f2a6e85a39addefe4db9f2130627c219 (diff) | |
download | frameworks_av-b34364269683363ca54aeed4952937cf37da7e06.zip frameworks_av-b34364269683363ca54aeed4952937cf37da7e06.tar.gz frameworks_av-b34364269683363ca54aeed4952937cf37da7e06.tar.bz2 |
Merge "Make it possible to pass empty opaque data as (NULL, 0) to ICrypto."
-rw-r--r-- | media/libmedia/ICrypto.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index e6bea1f..d51fe01 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -61,7 +61,11 @@ struct BpCrypto : public BpInterface<ICrypto> { data.writeInterfaceToken(ICrypto::getInterfaceDescriptor()); data.write(uuid, 16); data.writeInt32(opaqueSize); - data.write(opaqueData, opaqueSize); + + if (opaqueSize > 0) { + data.write(opaqueData, opaqueSize); + } + remote()->transact(CREATE_PLUGIN, data, &reply); return reply.readInt32(); @@ -179,13 +183,19 @@ status_t BnCrypto::onTransact( data.read(uuid, sizeof(uuid)); size_t opaqueSize = data.readInt32(); - void *opaqueData = malloc(opaqueSize); - data.read(opaqueData, opaqueSize); + void *opaqueData = NULL; + + if (opaqueSize > 0) { + opaqueData = malloc(opaqueSize); + data.read(opaqueData, opaqueSize); + } reply->writeInt32(createPlugin(uuid, opaqueData, opaqueSize)); - free(opaqueData); - opaqueData = NULL; + if (opaqueData != NULL) { + free(opaqueData); + opaqueData = NULL; + } return OK; } |