Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bit: avoid calling strdup(NULL)" am: 589f3e4871

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

Change-Id: I5524e43b77097f1bf2c7ac34c877a961cf61b5ad
This commit is contained in:
George Burgess
2022-02-24 04:01:27 +00:00
committed by Automerger Merge Worker
parent 75b5c61d45 589f3e4871
commit 96c1b4bd0e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/bit/command.cpp
View File

@@ -192,10 +192,11 @@ exec_with_path_search(const char* prog, char const* const* argv, char const* con
if (strchr(prog, '/') != NULL) { if (strchr(prog, '/') != NULL) {
return execve(prog, (char*const*)argv, (char*const*)envp); return execve(prog, (char*const*)argv, (char*const*)envp);
} else { } else {
char* pathEnv = strdup(getenv("PATH")); const char* pathEnvRaw = getenv("PATH");
if (pathEnv == NULL) { if (pathEnvRaw == NULL) {
return 1; return 1;
} }
char* pathEnv = strdup(pathEnvRaw);
char* dir = pathEnv; char* dir = pathEnv;
while (dir) { while (dir) {
char* next = strchr(dir, ':'); char* next = strchr(dir, ':');