Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45793a71 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 31b1b276: am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process" 

* commit '31b1b276':
  zygote: fix memory leak when fork process
parents 831c5a1e 31b1b276

core/jni/com_android_internal_os_Zygote.cpp

+2 −2
Original line number Diff line number Diff line
@@ -358,8 +358,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);

  }