diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-06-02 18:20:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-02 18:20:39 +0000 |
| commit | 27eb205e21e7715764084085f382d690e0406c63 (patch) | |
| tree | 0ed75f8f4ed1d31efd4df272715a82ac481f8190 | |
| parent | 4f8785f28e6305d427cc3e483248828c9b9b06a2 (diff) | |
| parent | 17a24c58bb2e86719f003c80f682beb66803f24d (diff) | |
| download | base-27eb205e21e7715764084085f382d690e0406c63.tar.gz | |
Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
| -rw-r--r-- | media/jni/android_mtp_MtpDatabase.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index 8129c0dfe711..270ab5988f9e 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -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: |