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

Merge "Tell bionic when we overwrite argv[0]."

Browse Source
This commit is contained in:
Elliott Hughes
2020-04-21 23:05:51 +00:00
committed by Gerrit Code Review
parent 8a6beab15e 07ce3ccc80
commit bf7cb1ca91
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/AndroidRuntime.cpp
View File

@@ -342,6 +342,8 @@ AndroidRuntime::~AndroidRuntime()
} }
void AndroidRuntime::setArgv0(const char* argv0, bool setProcName) { void AndroidRuntime::setArgv0(const char* argv0, bool setProcName) {
// Set the kernel's task name, for as much of the name as we can fit.
// The kernel's TASK_COMM_LEN minus one for the terminating NUL == 15.
if (setProcName) { if (setProcName) {
int len = strlen(argv0); int len = strlen(argv0);
if (len < 15) { if (len < 15) {
@@ -350,8 +352,14 @@ void AndroidRuntime::setArgv0(const char* argv0, bool setProcName) {
pthread_setname_np(pthread_self(), argv0 + len - 15); pthread_setname_np(pthread_self(), argv0 + len - 15);
} }
} }
// Directly change the memory pointed to by argv[0].
memset(mArgBlockStart, 0, mArgBlockLength); memset(mArgBlockStart, 0, mArgBlockLength);
strlcpy(mArgBlockStart, argv0, mArgBlockLength); strlcpy(mArgBlockStart, argv0, mArgBlockLength);
// Let bionic know that we just did that, because __progname points
// into argv[0] (https://issuetracker.google.com/152893281).
setprogname(mArgBlockStart);
} }
status_t AndroidRuntime::callMain(const String8& className, jclass clazz, status_t AndroidRuntime::callMain(const String8& className, jclass clazz,