Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcd4c584 authored by John Reck's avatar John Reck
Browse files

Fix JNI usage bugs. 

Avoids calling other JNI stuff with a pending exception by
ensuring methods return after jniThrowException.

Bug: 137323248
Test: app in bug doesn't throw JNI DETECTED ERROR IN APPLICATION: JNI NewDirectByteBuffer called with pending exception java.lang.UnsupportedOperationException: Pixel format: 0x1 is unsupported
2

Change-Id: Id06cb476a02c4180881772708e3bb58511efe573
parent 021598cb

media/jni/android_media_ImageReader.cpp

+9 −3
Original line number Diff line number Diff line
@@ -416,11 +416,13 @@ static void ImageReader_init(JNIEnv* env, jobject thiz, jobject weakThiz, jint w 
    if (res != OK) {

        jniThrowExceptionFmt(env, "java/lang/IllegalStateException",

                          "Failed to set buffer consumer default format 0x%x", nativeFormat);

        return;

    }

    res = bufferConsumer->setDefaultBufferDataSpace(nativeDataspace);

    if (res != OK) {

        jniThrowExceptionFmt(env, "java/lang/IllegalStateException",

                          "Failed to set buffer consumer default dataSpace 0x%x", nativeDataspace);

        return;

    }

}
@@ -704,7 +706,7 @@ static void Image_getLockedImage(JNIEnv* env, jobject thiz, LockedImage *image) 
    // and we don't set them here.

}



static void Image_getLockedImageInfo(JNIEnv* env, LockedImage* buffer, int idx,

static bool Image_getLockedImageInfo(JNIEnv* env, LockedImage* buffer, int idx,

        int32_t writerFormat, uint8_t **base, uint32_t *size, int *pixelStride, int *rowStride) {

    ALOGV("%s", __FUNCTION__);
@@ -713,7 +715,9 @@ static void Image_getLockedImageInfo(JNIEnv* env, LockedImage* buffer, int idx, 
    if (res != OK) {

        jniThrowExceptionFmt(env, "java/lang/UnsupportedOperationException",

                             "Pixel format: 0x%x is unsupported", buffer->flexFormat);

        return false;

    }

    return true;

}



static jobjectArray Image_createSurfacePlanes(JNIEnv* env, jobject thiz,
@@ -756,8 +760,10 @@ static jobjectArray Image_createSurfacePlanes(JNIEnv* env, jobject thiz, 
    }

    // Create all SurfacePlanes

    for (int i = 0; i < numPlanes; i++) {

        Image_getLockedImageInfo(env, &lockedImg, i, halReaderFormat,

                &pData, &dataSize, &pixelStride, &rowStride);

        if (!Image_getLockedImageInfo(env, &lockedImg, i, halReaderFormat,

                &pData, &dataSize, &pixelStride, &rowStride)) {

            return NULL;

        }

        byteBuffer = env->NewDirectByteBuffer(pData, dataSize);

        if ((byteBuffer == NULL) && (env->ExceptionCheck() == false)) {

            jniThrowException(env, "java/lang/IllegalStateException",

media/jni/android_media_ImageWriter.cpp

+8 −3
Original line number Diff line number Diff line
@@ -777,6 +777,7 @@ static void Image_unlockIfLocked(JNIEnv* env, jobject thiz) { 
        status_t res = buffer->unlock();

        if (res != OK) {

            jniThrowRuntimeException(env, "unlock buffer failed");

            return;

        }

        ALOGV("Successfully unlocked the image");

    }
@@ -872,7 +873,7 @@ static void Image_getLockedImage(JNIEnv* env, jobject thiz, LockedImage *image) 
    // and we don't set them here.

}



static void Image_getLockedImageInfo(JNIEnv* env, LockedImage* buffer, int idx,

static bool Image_getLockedImageInfo(JNIEnv* env, LockedImage* buffer, int idx,

        int32_t writerFormat, uint8_t **base, uint32_t *size, int *pixelStride, int *rowStride) {

    ALOGV("%s", __FUNCTION__);
@@ -881,7 +882,9 @@ static void Image_getLockedImageInfo(JNIEnv* env, LockedImage* buffer, int idx, 
    if (res != OK) {

        jniThrowExceptionFmt(env, "java/lang/UnsupportedOperationException",

                             "Pixel format: 0x%x is unsupported", buffer->flexFormat);

        return false;

    }

    return true;

}



static jobjectArray Image_createSurfacePlanes(JNIEnv* env, jobject thiz,
@@ -920,8 +923,10 @@ static jobjectArray Image_createSurfacePlanes(JNIEnv* env, jobject thiz, 
    PublicFormat publicWriterFormat = static_cast<PublicFormat>(writerFormat);

    writerFormat = mapPublicFormatToHalFormat(publicWriterFormat);

    for (int i = 0; i < numPlanes; i++) {

        Image_getLockedImageInfo(env, &lockedImg, i, writerFormat,

                &pData, &dataSize, &pixelStride, &rowStride);

        if (!Image_getLockedImageInfo(env, &lockedImg, i, writerFormat,

                &pData, &dataSize, &pixelStride, &rowStride)) {

            return NULL;

        }

        byteBuffer = env->NewDirectByteBuffer(pData, dataSize);

        if ((byteBuffer == NULL) && (env->ExceptionCheck() == false)) {

            jniThrowException(env, "java/lang/IllegalStateException",