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

Commit 91b48c37 authored by Josh Gao's avatar Josh Gao
Browse files

resolve merge conflicts of 9515c23e to klp-modular-dev 

Change-Id: I4b39875ce57bb1ea55898db3ffc004a491bbeaa4
parents c61a896f 9515c23e

debuggerd/tombstone.cpp

+2 −2
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static char* find_and_open_tombstone(int* fd) { 
    if (errno != ENOENT)

      continue;



    *fd = open(path, O_CREAT | O_EXCL | O_WRONLY, 0600);

    *fd = open(path, O_CREAT | O_EXCL | O_WRONLY | O_NOFOLLOW | O_CLOEXEC, 0600);

    if (*fd < 0)

      continue;   // raced ?
@@ -697,7 +697,7 @@ static char* find_and_open_tombstone(int* fd) { 


  // we didn't find an available file, so we clobber the oldest one

  snprintf(path, sizeof(path), TOMBSTONE_DIR"/tombstone_%02d", oldest);

  *fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0600);

  *fd = open(path, O_CREAT | O_TRUNC | O_WRONLY | O_NOFOLLOW | O_CLOEXEC, 0600);

  if (*fd < 0) {

    LOG("failed to open tombstone file '%s': %s\n", path, strerror(errno));

    return NULL;