diff options
| author | Jeff Tinker <jtinker@google.com> | 2017-03-15 20:36:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-15 20:36:33 +0000 |
| commit | e424bc24ea6d3c49832436c9e400c6244f3b8c5d (patch) | |
| tree | d3a9f53f0856ae29b35cb62021b99dc1df5085b1 /drm/libmediadrm/ICrypto.cpp | |
| parent | 4a71e75dc56415cda4cf33ea92d4efd914a44541 (diff) | |
| parent | 0be134af061566c7d68c0c4f868a677daf85f550 (diff) | |
| download | frameworks_av-e424bc24ea6d3c49832436c9e400c6244f3b8c5d.tar.gz frameworks_av-e424bc24ea6d3c49832436c9e400c6244f3b8c5d.tar.bz2 frameworks_av-e424bc24ea6d3c49832436c9e400c6244f3b8c5d.zip | |
Merge "Fix mediaserver crash due to NULL errorDetailMessage"
Diffstat (limited to 'drm/libmediadrm/ICrypto.cpp')
| -rw-r--r-- | drm/libmediadrm/ICrypto.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp index d8424bbc3e..92c9548027 100644 --- a/drm/libmediadrm/ICrypto.cpp +++ b/drm/libmediadrm/ICrypto.cpp @@ -149,7 +149,10 @@ struct BpCrypto : public BpInterface<ICrypto> { ssize_t result = reply.readInt32(); if (isCryptoError(result)) { - errorDetailMsg->setTo(reply.readCString()); + AString msg = reply.readCString(); + if (errorDetailMsg) { + *errorDetailMsg = msg; + } } return result; |