commit 0be134af061566c7d68c0c4f868a677daf85f550
author Jeff Tinker <jtinker@google.com> Thu Mar 09 17:01:10 2017 -0800
committer Jeff Tinker <jtinker@google.com> Mon Mar 13 11:37:24 2017 -0700
tree 126fab0ff10f8b5dc0582bf9325f326cf1022059
parent 886deb506ea2938cfec40fc0dd2bff072850386b

Fix mediaserver crash due to NULL errorDetailMessage

bug: 33905340
Change-Id: Icad86ad066a053f4aa9ca708a3c8690a68ec1856

drm/libmediadrm/ICrypto.cpp

diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp
index 10e6bc3..49a2d3e 100644
--- a/drm/libmediadrm/ICrypto.cpp
+++ b/drm/libmediadrm/ICrypto.cpp
@@ -149,7 +149,10 @@
         ssize_t result = reply.readInt32();
 
         if (isCryptoError(result)) {
-            errorDetailMsg->setTo(reply.readCString());
+            AString msg = reply.readCString();
+            if (errorDetailMsg) {
+                *errorDetailMsg = msg;
+            }
         }
 
         return result;