diff options
| author | Jeff Tinker <jtinker@google.com> | 2017-03-09 17:01:10 -0800 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2017-03-13 11:37:24 -0700 |
| commit | 0be134af061566c7d68c0c4f868a677daf85f550 (patch) | |
| tree | 126fab0ff10f8b5dc0582bf9325f326cf1022059 /drm/libmediadrm/ICrypto.cpp | |
| parent | 886deb506ea2938cfec40fc0dd2bff072850386b (diff) | |
| download | frameworks_av-0be134af061566c7d68c0c4f868a677daf85f550.tar.gz frameworks_av-0be134af061566c7d68c0c4f868a677daf85f550.tar.bz2 frameworks_av-0be134af061566c7d68c0c4f868a677daf85f550.zip | |
Fix mediaserver crash due to NULL errorDetailMessage
bug: 33905340
Change-Id: Icad86ad066a053f4aa9ca708a3c8690a68ec1856
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 10e6bc34cf..49a2d3e8f8 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; |