am ce4fbb4d: Merge "zygote: fix memory leak when fork process"

* commit 'ce4fbb4da675c447ec839deaad05c0e88701bc2c':
  zygote: fix memory leak when fork process
This commit is contained in:
Elliott Hughes
2015-08-20 01:24:30 +00:00
committed by Android Git Automerger

View File

@@ -356,8 +356,8 @@ static void DetachDescriptors(JNIEnv* env, jintArray fdsToClose) {
return;
}
jsize count = env->GetArrayLength(fdsToClose);
jint *ar = env->GetIntArrayElements(fdsToClose, 0);
if (!ar) {
ScopedIntArrayRO ar(env, fdsToClose);
if (ar.get() == NULL) {
ALOGE("Bad fd array");
RuntimeAbort(env);
}