| commit | c9ae6a729ac7dfc87e969bd4693d33287edc0bf1 | [log] [tgz] |
|---|---|---|
| author | andrewlewis <andrewlewis@google.com> | Mon Oct 26 14:19:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 26 14:19:49 2020 +0000 |
| tree | 941ecebd8b7c7d24fabc17c1e53371da767e38df | |
| parent | 9ecf2ddd93969a1f89eefa1d75d5369f62b99f32 [diff] | |
| parent | 761994f1880d6cc78558ee63918fe94d44b5d72d [diff] |
Merge "Initialize local uuid array with zeros" am: d5e35f0cb8 am: 95e0f64737 am: c41d235298 am: 761994f188 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1398555 Change-Id: I672bffc364a829546f7faa368bcb6f61d804e15c
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index c08d187..8a4b17c 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp
@@ -974,7 +974,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);