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

Don't create weird ByteBuffers

Browse Source 
Ensure that we don't create ByteBuffers with a NULL memory pointer
but nonzero size.
b/7892060

Change-Id: I2fc52e19fd05e698c38d94275e738e23a2999e1f
This commit is contained in:
Marco Nelissen
2012-12-19 11:42:55 -08:00
parent 412fbe7f8f
commit cbbea8e651
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
media/jni/android_media_MediaCodec.cpp
View File

@@ -237,15 +237,27 @@ status_t JMediaCodec::getBuffers(
*bufArray = (jobjectArray)env->NewObjectArray(
buffers.size(), byteBufferClass, NULL);
if (*bufArray == NULL) {
env->DeleteLocalRef(nativeByteOrderObj);
return NO_MEMORY;
}
for (size_t i = 0; i < buffers.size(); ++i) {
const sp<ABuffer> &buffer = buffers.itemAt(i);
// if this is an ABuffer that doesn't actually hold any accessible memory,
// use a null ByteBuffer
if (buffer->base() == NULL) {
continue;
}
jobject byteBuffer =
env->NewDirectByteBuffer(
buffer->base(),
buffer->capacity());
if (byteBuffer == NULL) {
env->DeleteLocalRef(nativeByteOrderObj);
return NO_MEMORY;
}
jobject me = env->CallObjectMethod(
byteBuffer, orderID, nativeByteOrderObj);
env->DeleteLocalRef(me);
@@ -715,7 +727,10 @@ static jobjectArray android_media_MediaCodec_getBuffers(
return buffers;
}
throwExceptionAsNecessary(env, err);
// if we're out of memory, an exception was already thrown
if (err != NO_MEMORY) {
throwExceptionAsNecessary(env, err);
}
return NULL;
}