diff options
| author | Christopher Ferris <cferris@google.com> | 2016-05-05 21:23:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-05 21:23:36 +0000 |
| commit | 512af70bc47804cf32b753f818503e58c88b6c81 (patch) | |
| tree | 77f0f3dd6c60f691340507ce5ec66c4a38f28a98 /debuggerd | |
| parent | 190786fff2fa8b78baebf046397d2eceef612dde (diff) | |
| parent | dac26a76c313b21b98d2b3d3ddcb6e824a78e233 (diff) | |
| download | system_core-512af70bc47804cf32b753f818503e58c88b6c81.tar.gz system_core-512af70bc47804cf32b753f818503e58c88b6c81.tar.bz2 system_core-512af70bc47804cf32b753f818503e58c88b6c81.zip | |
Merge "Fix null pointer dereference." into nyc-dev
am: dac26a76c3
* commit 'dac26a76c313b21b98d2b3d3ddcb6e824a78e233':
Fix null pointer dereference.
Change-Id: If306266358eaaec46e34e5a5954a3a2323a02d7d
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/tombstone.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp index 983d49e17..fa983fa1f 100644 --- a/debuggerd/tombstone.cpp +++ b/debuggerd/tombstone.cpp @@ -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"))) { |