diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-02-01 17:00:37 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-02-01 17:01:26 -0800 |
| commit | 77062b4e631b8500203e45f84b2b06061be0f863 (patch) | |
| tree | 527c243ebd1f89666f7813bf15d7355589826bf9 /media/libmedia | |
| parent | 96985edf1dd51dcf4a3bebbb2f7f2169bc619497 (diff) | |
| parent | 1e508ddce4250e04d06335fa1ceed1e1f0791da5 (diff) | |
| download | frameworks_av-77062b4e631b8500203e45f84b2b06061be0f863.zip frameworks_av-77062b4e631b8500203e45f84b2b06061be0f863.tar.gz frameworks_av-77062b4e631b8500203e45f84b2b06061be0f863.tar.bz2 | |
Merge tag 'android-6.0.1_r13' into HEAD
Android 6.0.1 release 13
Ticket: CYNGNOS-1522
Change-Id: Ie9d7be6df3e63138bafb892a3181446e3c7d844e
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/ICrypto.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index 5d822cf..bc696ca 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -325,7 +325,9 @@ status_t BnCrypto::onTransact( if (overflow || sumSubsampleSizes != totalSize) { result = -EINVAL; - } else if (offset + totalSize > sharedBuffer->size()) { + } else if (totalSize > sharedBuffer->size()) { + result = -EINVAL; + } else if ((size_t)offset > sharedBuffer->size() - totalSize) { result = -EINVAL; } else { result = decrypt( |