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

Commit 750e78bb authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."

* commit '27eb205e':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
parents daa0ee13 27eb205e
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -431,16 +431,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: