| commit | 95e0f647375f0bdbb3b02897950abd8cf3accf55 | [log] [tgz] |
|---|---|---|
| author | andrewlewis <andrewlewis@google.com> | Mon Oct 26 12:52:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 26 12:52:19 2020 +0000 |
| tree | 894ec726d0dfec0ceb963239941a94264337780f | |
| parent | 631cfd769e15b8fea3a03721fd8cd677f1ef5209 [diff] | |
| parent | d5e35f0cb8f8c13cb8fbb5490e7e0b40b6c6ccb5 [diff] |
Merge "Initialize local uuid array with zeros" am: d5e35f0cb8 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1398555 Change-Id: I2ea112a81ef0e1aab0d14ae8c9ed5a2f0765567c
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);