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

Commit 17a24c58 authored by Martin Blumenstingl's avatar Martin Blumenstingl
Browse files

MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue(). 

The jstring "stringValue" was not never freed.
In the case where "str" was NULL the whole cleanup part (see "goto out")
was even skipped.
This patch makes getObjectPropertyValue() behave like
getObjectPropertyList().

Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
parent 4f8785f2

media/jni/android_mtp_MtpDatabase.cpp

+2 −4
Original line number Diff line number Diff line
@@ -428,16 +428,14 @@ MtpResponseCode MyMtpDatabase::getObjectPropertyValue(MtpObjectHandle handle, 
            case MTP_TYPE_STR:

            {

                jstring stringValue = (jstring)env->GetObjectArrayElement(stringValuesArray, 0);

                const char* str = (stringValue ? env->GetStringUTFChars(stringValue, NULL) : NULL);

                if (stringValue) {

                    const char* str = env->GetStringUTFChars(stringValue, NULL);

                    if (str == NULL) {

                        return MTP_RESPONSE_GENERAL_ERROR;

                    }

                    packet.putString(str);

                    env->ReleaseStringUTFChars(stringValue, str);

                } else {

                    packet.putEmptyString();

                }

                env->DeleteLocalRef(stringValue);

                break;

             }

            default: