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

Commit 2711e494 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MTP: Check for null string before calling GetStringUTFChars() in MtpDatabase JNI 



BUG: 3274649

Change-Id: I5a3c8fcebf71ed453a121ca5a1345e39895d3bf3
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 086c0611

media/jni/android_media_MtpDatabase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ MtpResponseCode MyMtpDatabase::getObjectPropertyList(MtpObjectHandle handle, 
                    break;

                case MTP_TYPE_STR: {

                    jstring value = (jstring)env->GetObjectArrayElement(stringValuesArray, i);

                    const char *valueStr = env->GetStringUTFChars(value, NULL);

                    const char *valueStr = (value ? env->GetStringUTFChars(value, NULL) : NULL);

                    if (valueStr) {

                        packet.putString(valueStr);

                        env->ReleaseStringUTFChars(value, valueStr);