commit 638e5bad20b9d05f0d10b5e216cf5860a18ffc70
author Jeff Tinker <jtinker@google.com> Mon Feb 08 17:52:25 2016 -0800
committer The Android Automerger <android-build@google.com> Fri Feb 26 16:56:00 2016 -0800
tree c4451c5fba8bfae83cacb2f8d34932ffe25543f8
parent 3ba0bbe12904d0dfa2245fa3abf2b92034b15db3

Fix info leak vulnerability of IDrm

bug: 26323455
Change-Id: I25bb30d3666ab38d5150496375ed2f55ecb23ba8

media/libmedia/IDrm.cpp

diff --git a/media/libmedia/IDrm.cpp b/media/libmedia/IDrm.cpp
index b1ad0c5..7c709cd 100644
--- a/media/libmedia/IDrm.cpp
+++ b/media/libmedia/IDrm.cpp
@@ -658,7 +658,7 @@
 
             Vector<uint8_t> request;
             String8 defaultUrl;
-            DrmPlugin::KeyRequestType keyRequestType;
+            DrmPlugin::KeyRequestType keyRequestType = DrmPlugin::kKeyRequestType_Unknown;
 
             status_t result = getKeyRequest(sessionId, initData, mimeType,
                     keyType, optionalParameters, request, defaultUrl,