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

Commit f7b287c2 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Automerger Merge Worker
Browse files

Merge "Fix two problems in the ExecuteBinary function." am: e0561210 am:... 

Merge "Fix two problems in the ExecuteBinary function." am: e0561210 am: b16d968e am: 43ce684e am: a3b1c2e0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: I370823e12747a8046580d061c3bdf489a332dceb
parents 42a0f896 a3b1c2e0

libs/androidfw/PosixUtils.cpp

+5 −2
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ std::unique_ptr<ProcResult> ExecuteBinary(const std::vector<std::string>& argv) 
    argv0[i] = argv[i].c_str();

  }

  argv0[argv.size()] = nullptr;

  switch (fork()) {

  int pid = fork();

  switch (pid) {

    case -1: // error

      free(argv0);

      PLOG(ERROR) << "fork";
@@ -104,8 +105,10 @@ std::unique_ptr<ProcResult> ExecuteBinary(const std::vector<std::string>& argv) 
      close(stdout[1]);

      close(stderr[1]);

      int status;

      wait(&status);

      waitpid(pid, &status, 0);

      if (!WIFEXITED(status)) {

          close(stdout[0]);

          close(stderr[0]);

          return nullptr;

      }

      std::unique_ptr<ProcResult> result(new ProcResult());