commit 58a982d1c7a316d1bb8fade837664a412241ba8a
author Jeff Tinker <jtinker@google.com> Mon Feb 22 23:35:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 22 23:35:57 2016 +0000
tree 850076bbe76481cc3c7c0c27b6fea75f6d89d545
parent aef546b8f79e9a9252005b60122899cf5f8af67c
parent 96ddf53162ffdef3e47a99bd0480b00678c0273c

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

* commit '96ddf53162ffdef3e47a99bd0480b00678c0273c':
  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,