commit 2442047f5c6d368f69fa81917f5aabc9b3c342a0
author Jeff Tinker <jtinker@google.com> Thu Jan 11 17:46:16 2018 -0800
committer Jeff Tinker <jtinker@google.com> Fri Jan 12 07:45:26 2018 +0000
tree 46a63cbb73723b6f37fe6b8275c7045335ef4435
parent 5231cc164fe040a3ab5fcb28baae4e0a4f9fdf4c

Fix use of uninitialized value in libmediadrm

bug:70526702
test:gts media tests

Change-Id: I29a67dad01ca8c8f649ba12cf08cc86b7eb56523

drm/libmediadrm/CryptoHal.cpp

diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp
index d613a5b..1fdc6e1 100644
--- a/drm/libmediadrm/CryptoHal.cpp
+++ b/drm/libmediadrm/CryptoHal.cpp
@@ -331,10 +331,13 @@
             return status;
         }
         secure = false;
-    } else {
+    } else if (destination.mType == kDestinationTypeNativeHandle) {
         hDestination.type = BufferType::NATIVE_HANDLE;
         hDestination.secureMemory = hidl_handle(destination.mHandle);
         secure = true;
+    } else {
+        android_errorWriteLog(0x534e4554, "70526702");
+        return UNKNOWN_ERROR;
     }
 
     ::SharedBuffer hSource;