commit 8d2c3d65d06bdf21a8fa4715352cb2a12a442579
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 04 00:38:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 04 00:38:31 2020 +0000
tree f2489e7b4ec31cade8f1b12b4c7267ef7bc3bd08
parent d0d078020e26dd9ff1f870491bbfef0f9b9560de
parent 911b808a6568fee9c2fd1aa89039161195873350

[DO NOT MERGE] Fix uninitialized data in IHDCP decrypt am: 58af3de44d am: 911b808a65

Change-Id: Id9527a17ad36c249658b211b9f6b6073907666a9

media/libmedia/IHDCP.cpp

diff --git a/media/libmedia/IHDCP.cpp b/media/libmedia/IHDCP.cpp
index a46017f..c608175 100644
--- a/media/libmedia/IHDCP.cpp
+++ b/media/libmedia/IHDCP.cpp
@@ -333,11 +333,12 @@
 
             void *outData = (uint8_t *)inData + size;
 
-            data.read(inData, size);
-
-            uint32_t streamCTR = data.readInt32();
-            uint64_t inputCTR = data.readInt64();
-            status_t err = decrypt(inData, size, streamCTR, inputCTR, outData);
+            status_t err = data.read(inData, size);
+            if (err == OK) {
+                uint32_t streamCTR = data.readInt32();
+                uint64_t inputCTR = data.readInt64();
+                err = decrypt(inData, size, streamCTR, inputCTR, outData);
+            }
 
             reply->writeInt32(err);