| commit | 761994f1880d6cc78558ee63918fe94d44b5d72d | [log] [tgz] |
|---|---|---|
| author | andrewlewis <andrewlewis@google.com> | Mon Oct 26 14:00:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 26 14:00:45 2020 +0000 |
| tree | db079d135a5f4292f84da9e31e9f6837d2664363 | |
| parent | 61f4db5b8bf7f5200407d7c0c709e7cfc87c18cf [diff] | |
| parent | c41d235298dce99426df86383adb7be69b35cf70 [diff] |
Merge "Initialize local uuid array with zeros" am: d5e35f0cb8 am: 95e0f64737 am: c41d235298 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1398555 Change-Id: I5054fc176f47a3572e34733f584480de7f7d9107
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index 20bc23d..4c76fd2 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp
@@ -958,7 +958,7 @@ case PREPARE_DRM: { CHECK_INTERFACE(IMediaPlayer, data, reply); - uint8_t uuid[16]; + uint8_t uuid[16] = {}; data.read(uuid, sizeof(uuid)); Vector<uint8_t> drmSessionId; readVector(data, drmSessionId);