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

Commit 05c5ef47 authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Fix null pointer dereference." 

am: 830561bb

* commit '830561bb':
  Fix null pointer dereference.

Change-Id: I82a4e97c61c1d3aaef1e4af1292cab06eb804ccc
parents 9c02f237 830561bb

debuggerd/tombstone.cpp

+3 −3
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void dump_signal_info(log_t* log, pid_t tid, int signal, int si_code) { 
static void dump_thread_info(log_t* log, pid_t pid, pid_t tid) {

  char path[64];

  char threadnamebuf[1024];

  char* threadname = NULL;

  char* threadname = nullptr;

  FILE *fp;



  snprintf(path, sizeof(path), "/proc/%d/comm", tid);
@@ -217,13 +217,13 @@ static void dump_thread_info(log_t* log, pid_t pid, pid_t tid) { 
  }

  // Blacklist logd, logd.reader, logd.writer, logd.auditd, logd.control ...

  static const char logd[] = "logd";

  if (!strncmp(threadname, logd, sizeof(logd) - 1)

  if (threadname != nullptr && !strncmp(threadname, logd, sizeof(logd) - 1)

      && (!threadname[sizeof(logd) - 1] || (threadname[sizeof(logd) - 1] == '.'))) {

    log->should_retrieve_logcat = false;

  }



  char procnamebuf[1024];

  char* procname = NULL;

  char* procname = nullptr;



  snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);

  if ((fp = fopen(path, "r"))) {