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

Change-Id: Id9527a17ad36c249658b211b9f6b6073907666a9
4 years ago · 8d2c3d65d0
parent d0d078020e 911b808a65
commit 8d2c3d65d0
1 changed files with 6 additions and 5 deletions
--- a/media/libmedia/IHDCP.cpp
+++ b/media/libmedia/IHDCP.cpp
@ -333,11 +333,12 @@ status_t BnHDCP::onTransact(

            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);