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

Commit fefda6b5 authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge changes from topic 'debuggerd_snprintf' 

* changes:
  crash_dump: fix typos in error messages.
  debuggerd_handler: don't use snprintf in handler.
parents 5a306ec6 f6ad5851

debuggerd/crash_dump.cpp

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static void check_process(int proc_fd, pid_t expected_pid) { 
  }



  if (proc_info.pid != expected_pid) {

    LOG(FATAL) << "pid mismatch: expected " << expected_pid << ", actual " << proc_info.ppid;

    LOG(FATAL) << "pid mismatch: expected " << expected_pid << ", actual " << proc_info.pid;

  }

}
@@ -254,7 +254,7 @@ int main(int argc, char** argv) { 
  }



  if (!android::base::ParseInt(argv[2], &pseudothread_tid, 1, std::numeric_limits<pid_t>::max())) {

    LOG(FATAL) << "invalid pseudothread tid: " << argv[1];

    LOG(FATAL) << "invalid pseudothread tid: " << argv[2];

  }



  android::procinfo::ProcessInfo target_info;

debuggerd/handler/debuggerd_handler.cpp

+4 −3
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void __noreturn __printflike(1, 2) fatal_errno(const char* fmt, ...) { 
  va_start(args, fmt);



  char buf[4096];

  vsnprintf(buf, sizeof(buf), fmt, args);

  __libc_format_buffer_va_list(buf, sizeof(buf), fmt, args);

  fatal("%s: %s", buf, strerror(err));

}
@@ -256,8 +256,9 @@ static int debuggerd_dispatch_pseudothread(void* arg) { 


    char main_tid[10];

    char pseudothread_tid[10];

    snprintf(main_tid, sizeof(main_tid), "%d", thread_info->crashing_tid);

    snprintf(pseudothread_tid, sizeof(pseudothread_tid), "%d", thread_info->pseudothread_tid);

    __libc_format_buffer(main_tid, sizeof(main_tid), "%d", thread_info->crashing_tid);

    __libc_format_buffer(pseudothread_tid, sizeof(pseudothread_tid), "%d", thread_info->pseudothread_tid);



    execl(CRASH_DUMP_PATH, CRASH_DUMP_NAME, main_tid, pseudothread_tid, nullptr);



    fatal_errno("exec failed");