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

am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"

Browse Source 
* commit '62632e25f57989d5e5ac406e21f037a3e2f39b9c':
  Handle NULL keys and NULL values in MediaDrm JNI HashMap
This commit is contained in:
Jeff Tinker
2015-03-13 18:35:32 +00:00
committed by Android Git Automerger
parent 870110e01a 62632e25f5
commit 0d22633e07
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
media/jni/android_media_MediaDrm.cpp
View File

@@ -438,9 +438,11 @@ static String8 JStringToString8(JNIEnv *env, jstring const &jstr) {
Entry e = s.next(); Entry e = s.next();
*/ */
static KeyedVector<String8, String8> HashMapToKeyedVector(JNIEnv *env, jobject &hashMap) { static KeyedVector<String8, String8> HashMapToKeyedVector(
JNIEnv *env, jobject &hashMap, bool* pIsOK) {
jclass clazz = gFields.stringClassId; jclass clazz = gFields.stringClassId;
KeyedVector<String8, String8> keyedVector; KeyedVector<String8, String8> keyedVector;
*pIsOK = true;
jobject entrySet = env->CallObjectMethod(hashMap, gFields.hashmap.entrySet); jobject entrySet = env->CallObjectMethod(hashMap, gFields.hashmap.entrySet);
if (entrySet) { if (entrySet) {
@@ -451,16 +453,22 @@ static KeyedVector<String8, String8> HashMapToKeyedVector(JNIEnv *env, jobject &
jobject entry = env->CallObjectMethod(iterator, gFields.iterator.next); jobject entry = env->CallObjectMethod(iterator, gFields.iterator.next);
if (entry) { if (entry) {
jobject obj = env->CallObjectMethod(entry, gFields.entry.getKey); jobject obj = env->CallObjectMethod(entry, gFields.entry.getKey);
if (!env->IsInstanceOf(obj, clazz)) { if (obj == NULL || !env->IsInstanceOf(obj, clazz)) {
jniThrowException(env, "java/lang/IllegalArgumentException", jniThrowException(env, "java/lang/IllegalArgumentException",
"HashMap key is not a String"); "HashMap key is not a String");
env->DeleteLocalRef(entry);
*pIsOK = false;
break;
} }
jstring jkey = static_cast<jstring>(obj); jstring jkey = static_cast<jstring>(obj);
obj = env->CallObjectMethod(entry, gFields.entry.getValue); obj = env->CallObjectMethod(entry, gFields.entry.getValue);
if (!env->IsInstanceOf(obj, clazz)) { if (obj == NULL || !env->IsInstanceOf(obj, clazz)) {
jniThrowException(env, "java/lang/IllegalArgumentException", jniThrowException(env, "java/lang/IllegalArgumentException",
"HashMap value is not a String"); "HashMap value is not a String");
env->DeleteLocalRef(entry);
*pIsOK = false;
break;
} }
jstring jvalue = static_cast<jstring>(obj); jstring jvalue = static_cast<jstring>(obj);
@@ -763,7 +771,11 @@ static jobject android_media_MediaDrm_getKeyRequest(
KeyedVector<String8, String8> optParams; KeyedVector<String8, String8> optParams;
if (joptParams != NULL) { if (joptParams != NULL) {
optParams = HashMapToKeyedVector(env, joptParams); bool isOK;
optParams = HashMapToKeyedVector(env, joptParams, &isOK);
if (!isOK) {
return NULL;
}
} }
Vector<uint8_t> request; Vector<uint8_t> request;