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

Commit da0b8f45 authored by Hans Boehm's avatar Hans Boehm
Browse files

Fix error formatting issues 

I missed a couple of CREATE_ERROR calls the first time around.
Unfortunately, type checking is loose enough to miss that.

Bug: 187992348
Test: TreeHugger
Change-Id: Ib7c227fa0e8491d8ce7cd0d82217098664e3182d
parent 56ba9447

core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ jboolean com_android_internal_os_ZygoteCommandBuffer_nativeForkRepeatedly( 
  socklen_t cred_size = sizeof credentials;

  if (getsockopt(n_buffer->getFd(), SOL_SOCKET, SO_PEERCRED, &credentials, &cred_size) == -1

      || cred_size != sizeof credentials) {

    fail_fn_1("ForkMany failed to get initial credentials, %s", strerror(errno));

    fail_fn_1(CREATE_ERROR("ForkMany failed to get initial credentials, %s", strerror(errno)));

  }



  bool first_time = true;
@@ -453,7 +453,7 @@ jboolean com_android_internal_os_ZygoteCommandBuffer_nativeForkRepeatedly( 
      close(session_socket);

      int new_fd = accept(zygote_socket_fd, nullptr, nullptr);

      if (new_fd == -1) {

        fail_fn_z("Accept(%d) failed: %s", zygote_socket_fd, strerror(errno));

        fail_fn_z(CREATE_ERROR("Accept(%d) failed: %s", zygote_socket_fd, strerror(errno)));

      }

      if (new_fd != session_socket) {

          // Move new_fd back to the old value, so that we don't have to change Java-level data