commit 96ddf53162ffdef3e47a99bd0480b00678c0273c
author Jeff Tinker <jtinker@google.com> Mon Feb 22 23:29:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 22 23:29:53 2016 +0000
tree dfedb4695839727842f75bee231f6630964fd676
parent 3c6a1fe754493b38e1e8bf3bc5497841d091f3af
parent 0708170e10aa05f8ce590bb9daa23d770e57b130

Merge "Fix info leak vulnerability of IDrm" into mnc-dev am: 56ffb6e7b1
am: 0708170e10

* commit '0708170e10aa05f8ce590bb9daa23d770e57b130':
  Fix info leak vulnerability of IDrm

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,