summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Arun Johnson <arunjohnson@google.com> 2024-02-24 00:01:33 +0000
committer Arun Johnson <arunjohnson@google.com> 2024-02-29 18:22:09 +0000
commit2aef16f950c925422010d69f812a4f02c7655c75 (patch)
treedf21de7325f5778a16977b78bc15e453c52d3208
parent344143b49cf4c132848da73dc62f9ce0737ad695 (diff)
Adding extra checks to bound linear block sizes
Bug: 326660896 Change-Id: Ia75293bf9341a8423b6fabebd87ea8bfd85171c3
-rw-r--r--media/jni/android_media_MediaCodec.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 8396005b1b63..e32556247e0d 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -2895,6 +2895,10 @@ static void extractBufferFromContext(
jint offset,
jint size,
std::shared_ptr<C2Buffer> *buffer) {
+ if ((offset + size) > context->capacity()) {
+ ALOGW("extractBufferFromContext: offset + size provided exceed capacity");
+ return;
+ }
*buffer = context->toC2Buffer(offset, size);
if (*buffer == nullptr) {
if (!context->mMemory) {