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

Fix NativeThemeRebase null abort

Browse Source 
ReleasePrimitiveArrayCritical will fail if the java object being
released is null. The array may be null if `style_count` is 0.
Do not call ReleasePrimitiveArrayCritical on the array if it is null.

Bug: 190927589
Test: forest
Change-Id: I432668f71137908838ebc3a47d834c1da3c67777
This commit is contained in:
Ryan Mitchell
2021-06-14 09:13:58 -07:00
parent 3b5e4d2936
commit 489d49d325
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android_util_AssetManager.cpp
View File

@@ -1282,6 +1282,8 @@ static void NativeThemeRebase(JNIEnv* env, jclass /*clazz*/, jlong ptr, jlong th
if (style_id_args == nullptr) {
return;
}
} else {
CHECK(style_count == 0) << "style_ids is null while style_count is non-zero";
}
jboolean* force_args = nullptr;
@@ -1292,12 +1294,18 @@ static void NativeThemeRebase(JNIEnv* env, jclass /*clazz*/, jlong ptr, jlong th
env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
return;
}
} else {
CHECK(style_count == 0) << "force is null while style_count is non-zero";
}
auto theme = reinterpret_cast<Theme*>(theme_ptr);
theme->Rebase(&(*assetmanager), style_id_args, force_args, static_cast<size_t>(style_count));
env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
env->ReleasePrimitiveArrayCritical(force, force_args, JNI_ABORT);
if (style_ids != nullptr) {
env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
}
if (force != nullptr) {
env->ReleasePrimitiveArrayCritical(force, force_args, JNI_ABORT);
}
}
static void NativeThemeCopy(JNIEnv* env, jclass /*clazz*/, jlong dst_asset_manager_ptr,