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

Commit ca643d24 authored by George Burgess's avatar George Burgess Committed by Automerger Merge Worker
Browse files

Merge "bit: avoid calling strdup(NULL)" am: 589f3e48 am: 96c1b4bd am: 5fdccc45 am: 6ed5d640 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1995590

Change-Id: I9f54f7a565a3bfc4a9b9cb76cb7ea2e7cb65854b
parents 65289974 6ed5d640

tools/bit/command.cpp

+3 −2
Original line number Diff line number Diff line
@@ -192,10 +192,11 @@ exec_with_path_search(const char* prog, char const* const* argv, char const* con 
    if (strchr(prog, '/') != NULL) {

        return execve(prog, (char*const*)argv, (char*const*)envp);

    } else {

        char* pathEnv = strdup(getenv("PATH"));

        if (pathEnv == NULL) {

        const char* pathEnvRaw = getenv("PATH");

        if (pathEnvRaw == NULL) {

            return 1;

        }

        char* pathEnv = strdup(pathEnvRaw);

        char* dir = pathEnv;

        while (dir) {

            char* next = strchr(dir, ':');