drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '27eb205e21e7715764084085f382d690e0406c63':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
This commit is contained in:
Mike Lockwood
2014-06-02 18:25:28 +00:00
committed by Android Git Automerger
parent daa0ee137d 27eb205e21
commit 750e78bb76
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/jni/android_mtp_MtpDatabase.cpp
View File

@ -431,16 +431,14 @@ MtpResponseCode MyMtpDatabase::getObjectPropertyValue(MtpObjectHandle handle,
case MTP_TYPE_STR: case MTP_TYPE_STR:
{ {
jstring stringValue = (jstring)env->GetObjectArrayElement(stringValuesArray, 0); jstring stringValue = (jstring)env->GetObjectArrayElement(stringValuesArray, 0);
const char* str = (stringValue ? env->GetStringUTFChars(stringValue, NULL) : NULL);
if (stringValue) { if (stringValue) {
const char* str = env->GetStringUTFChars(stringValue, NULL);
if (str == NULL) {
return MTP_RESPONSE_GENERAL_ERROR;
}
packet.putString(str); packet.putString(str);
env->ReleaseStringUTFChars(stringValue, str); env->ReleaseStringUTFChars(stringValue, str);
} else { } else {
packet.putEmptyString(); packet.putEmptyString();
} }
env->DeleteLocalRef(stringValue);
break; break;
} }
default: default: