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

Commit 1b607e7f authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Add crasher check for passing a bad pthread_t to pthread_join." 

am: fac6d83d

Change-Id: Icfa86004a6e15f80a25ed128be8f3496312a3e3b
parents 18ac6293 fac6d83d

debuggerd/crasher/crasher.cpp

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ static int usage() { 
    fprintf(stderr, "  fprintf-NULL          pass a null pointer to fprintf\n");

    fprintf(stderr, "  readdir-NULL          pass a null pointer to readdir\n");

    fprintf(stderr, "  strlen-NULL           pass a null pointer to strlen\n");

    fprintf(stderr, "  pthread_join-NULL     pass a null pointer to pthread_join\n");

    fprintf(stderr, "\n");

    fprintf(stderr, "  no_new_privs          set PR_SET_NO_NEW_PRIVS and then abort\n");

    fprintf(stderr, "\n");
@@ -258,6 +259,8 @@ noinline int do_action(const char* arg) { 
        readdir_null();

    } else if (!strcasecmp(arg, "strlen-NULL")) {

        return strlen_null();

    } else if (!strcasecmp(arg, "pthread_join-NULL")) {

        return pthread_join(0, nullptr);

    } else if (!strcasecmp(arg, "heap-usage")) {

        abuse_heap();

    } else if (!strcasecmp(arg, "SIGSEGV-unmapped")) {