Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix potential NULL dereference errors." am: bce5b2f971 am: 76451438d9

Browse Source 
am: 621afac235

Change-Id: Id7a8506c6ee2667f6a303905359a99e80dbced9d
This commit is contained in:
George Burgess IV
2019-01-18 19:20:50 -08:00
committed by android-build-merger
parent 086e3a4056 621afac235
commit 97378a6ed0
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
media/jni/android_mtp_MtpDatabase.cpp
View File

@@ -708,6 +708,24 @@ MtpResponseCode MtpDatabase::getObjectPropertyList(MtpObjectHandle handle,
int type = dataTypes[i];
packet.putUInt16(type);
if (type == MTP_TYPE_STR) {
jstring value = (jstring)env->GetObjectArrayElement(stringValuesArray, i);
const char *valueStr = (value ? env->GetStringUTFChars(value, NULL) : NULL);
if (valueStr) {
packet.putString(valueStr);
env->ReleaseStringUTFChars(value, valueStr);
} else {
packet.putEmptyString();
}
env->DeleteLocalRef(value);
continue;
}
if (!longValues) {
ALOGE("bad longValuesArray value in MyMtpDatabase::getObjectPropertyList");
continue;
}
switch (type) {
case MTP_TYPE_INT8:
packet.putInt8(longValues[i]);
@@ -739,18 +757,6 @@ MtpResponseCode MtpDatabase::getObjectPropertyList(MtpObjectHandle handle,
case MTP_TYPE_UINT128:
packet.putUInt128(longValues[i]);
break;
case MTP_TYPE_STR: {
jstring value = (jstring)env->GetObjectArrayElement(stringValuesArray, i);
const char *valueStr = (value ? env->GetStringUTFChars(value, NULL) : NULL);
if (valueStr) {
packet.putString(valueStr);
env->ReleaseStringUTFChars(value, valueStr);
} else {
packet.putEmptyString();
}
env->DeleteLocalRef(value);
break;
}
default:
ALOGE("bad or unsupported data type in MtpDatabase::getObjectPropertyList");
break;