diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-30 16:57:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-30 16:57:51 -0700 |
| commit | 3427e80ef38bc7aae1278cfe78a65d9524f92c69 (patch) | |
| tree | 13af9319ba083ac13ebc7e19464f7de047d4042f /debuggerd | |
| parent | 6575a1625ac585b46f90c6f036db9231db50c969 (diff) | |
| parent | a6fb0e05aa95995445c6f2b65f07db26bdbfd46c (diff) | |
| download | system_core-3427e80ef38bc7aae1278cfe78a65d9524f92c69.zip system_core-3427e80ef38bc7aae1278cfe78a65d9524f92c69.tar.gz system_core-3427e80ef38bc7aae1278cfe78a65d9524f92c69.tar.bz2 | |
am a6fb0e05: Merge "Fix debuggerd\'s use of readdir_r(3)."
* commit 'a6fb0e05aa95995445c6f2b65f07db26bdbfd46c':
Fix debuggerd's use of readdir_r(3).
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/backtrace.c | 7 | ||||
| -rw-r--r-- | debuggerd/tombstone.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/debuggerd/backtrace.c b/debuggerd/backtrace.c index 62f7f32..ba76e7d 100644 --- a/debuggerd/backtrace.c +++ b/debuggerd/backtrace.c @@ -125,10 +125,9 @@ void dump_backtrace(int fd, pid_t pid, pid_t tid, bool* detach_failed, char task_path[64]; snprintf(task_path, sizeof(task_path), "/proc/%d/task", pid); DIR* d = opendir(task_path); - if (d) { - struct dirent debuf; - struct dirent *de; - while (!readdir_r(d, &debuf, &de) && de) { + if (d != NULL) { + struct dirent* de = NULL; + while ((de = readdir(d)) != NULL) { if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) { continue; } diff --git a/debuggerd/tombstone.c b/debuggerd/tombstone.c index 5feabe5..5f2db43 100644 --- a/debuggerd/tombstone.c +++ b/debuggerd/tombstone.c @@ -414,9 +414,8 @@ static bool dump_sibling_thread_report(const ptrace_context_t* context, } bool detach_failed = false; - struct dirent debuf; - struct dirent *de; - while (!readdir_r(d, &debuf, &de) && de) { + struct dirent* de; + while ((de = readdir(d)) != NULL) { /* Ignore "." and ".." */ if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) { continue; |