openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am a6fb0e05: Merge "Fix debuggerd\'s use of readdir_r(3)." 

* commit 'a6fb0e05aa95995445c6f2b65f07db26bdbfd46c':
  Fix debuggerd's use of readdir_r(3).
This commit is contained in:
Elliott Hughes 2012-10-30 16:57:51 -07:00 committed by Android Git Automerger
parent 6575a1625a a6fb0e05aa
commit 3427e80ef3
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debuggerd/backtrace.c
View File

@ -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;
}

5
debuggerd/tombstone.c
View File

@ -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;