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

Commit 7c68a407 authored by Pawel Augustyn's avatar Pawel Augustyn Committed by Henrik Baard
Browse files

Fix for native leaks in YuvToJpegEncoder.cpp 

Objects allocated by Get<object>ArrayElements function,
should be released. Add a fix to release this objects
in error cases.

Change-Id: Idf834523d93bb2dfd6b872e3b2179b7f1bba38f3
parent e05b7b50

core/jni/android/graphics/YuvToJpegEncoder.cpp

+6 −5
Original line number Diff line number Diff line
@@ -226,16 +226,17 @@ static jboolean YuvImage_compressToJpeg(JNIEnv* env, jobject, jbyteArray inYuv, 
    jint* imgOffsets = env->GetIntArrayElements(offsets, NULL);

    jint* imgStrides = env->GetIntArrayElements(strides, NULL);

    YuvToJpegEncoder* encoder = YuvToJpegEncoder::create(format, imgStrides);

    if (encoder == NULL) {

        return JNI_FALSE;

    }

    jboolean result = JNI_FALSE;

    if (encoder != NULL) {

        encoder->encode(strm, yuv, width, height, imgOffsets, jpegQuality);



        delete encoder;

        result = JNI_TRUE;

    }



    env->ReleaseByteArrayElements(inYuv, yuv, 0);

    env->ReleaseIntArrayElements(offsets, imgOffsets, 0);

    env->ReleaseIntArrayElements(strides, imgStrides, 0);

    return JNI_TRUE;

    return result;

}

///////////////////////////////////////////////////////////////////////////////