Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch nullptr possibilities in MediaExtractor jni code" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-12 12:19:43 +00:00
committed by Android (Google) Code Review
parent e593fef839 1ef49b8757
commit d63a1d1644
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/jni/android_media_MediaExtractor.cpp
View File

@@ -196,6 +196,15 @@ status_t JMediaExtractor::readSampleData(
dstSize = (size_t) env->GetDirectBufferCapacity(byteBuf);
}
// unlikely, but GetByteArrayElements() can fail
if (dst == nullptr) {
ALOGE("no buffer into which to read the data");
if (byteArray != NULL) {
env->ReleaseByteArrayElements(byteArray, (jbyte *)dst, 0);
}
return -ENOMEM;
}
if (dstSize < offset) {
if (byteArray != NULL) {
env->ReleaseByteArrayElements(byteArray, (jbyte *)dst, 0);
@@ -204,8 +213,10 @@ status_t JMediaExtractor::readSampleData(
return -ERANGE;
}
// passes in the backing memory to use, so it doesn't fail
sp<ABuffer> buffer = new ABuffer((char *)dst + offset, dstSize - offset);
buffer->setRange(0, 0); // mark it empty
status_t err = mImpl->readSampleData(buffer);
if (byteArray != NULL) {