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

Commit 9f026869 authored by Andreas Huber's avatar Andreas Huber
Browse files

Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections. 

Test: make, hidl_test_java
Bug: 32670143
Change-Id: Ia987a26fceab41cfc18fbae7c83e01dff1d9d11a
parent 605df82c

core/jni/android_os_HwParcel.cpp

+15 −14
Original line number Diff line number Diff line
@@ -267,17 +267,17 @@ static void JHwParcel_native_writeInterfaceToken( 


    const jchar *interfaceName = env->GetStringCritical(interfaceNameObj, NULL);

    if (interfaceName) {

        hardware::Parcel *parcel =

            JHwParcel::GetNativeContext(env, thiz)->getParcel();



        status_t err = parcel->writeInterfaceToken(

                String16(

        String16 nameCopy(

                reinterpret_cast<const char16_t *>(interfaceName),

                    env->GetStringLength(interfaceNameObj)));

                env->GetStringLength(interfaceNameObj));



        env->ReleaseStringCritical(interfaceNameObj, interfaceName);

        interfaceName = NULL;



        hardware::Parcel *parcel =

            JHwParcel::GetNativeContext(env, thiz)->getParcel();



        status_t err = parcel->writeInterfaceToken(nameCopy);

        signalExceptionForError(env, err);

    }

}
@@ -294,17 +294,18 @@ static void JHwParcel_native_enforceInterface( 


    const jchar *interfaceName = env->GetStringCritical(interfaceNameObj, NULL);

    if (interfaceName) {

        hardware::Parcel *parcel =

            JHwParcel::GetNativeContext(env, thiz)->getParcel();



        bool valid = parcel->enforceInterface(

                String16(

        String16 interfaceNameCopy(

                reinterpret_cast<const char16_t *>(interfaceName),

                    env->GetStringLength(interfaceNameObj)));

                env->GetStringLength(interfaceNameObj));



        env->ReleaseStringCritical(interfaceNameObj, interfaceName);

        interfaceName = NULL;



        hardware::Parcel *parcel =

            JHwParcel::GetNativeContext(env, thiz)->getParcel();



        bool valid = parcel->enforceInterface(interfaceNameCopy);



        if (!valid) {

            jniThrowException(

                    env,