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

Commit c463d2cf authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Fix debuggerd's use of readdir_r(3). 

Change-Id: I1b178af054cefebfb774320e4b4699d6dc8bbb01
parent 8f98c4b5

debuggerd/backtrace.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

            }

debuggerd/tombstone.c

+2 −3
Original line number Diff line number Diff line
@@ -405,9 +405,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) {

    while ((de = readdir(d)) != NULL) {

        /* Ignore "." and ".." */

        if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) {

            continue;