MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix SEGFAULT in magisk log dumper

Browse Source
This commit is contained in:
topjohnwu 2017-10-14 21:09:32 +08:00
parent c7e777255a
commit 28a945fee9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jni/daemon/log_monitor.c
View File

@ -25,6 +25,8 @@ static void *logger_thread(void *args) {
int log_fd = -1, log_pid; int log_fd = -1, log_pid;
char line[4096]; char line[4096];
LOGD("log_monitor: logger start");
while (1) { while (1) {
// Start logcat // Start logcat
log_pid = exec_command(0, &log_fd, NULL, "logcat", "-b", "all" , "-v", "threadtime", "-s", "am_proc_start", "Magisk", NULL); log_pid = exec_command(0, &log_fd, NULL, "logcat", "-b", "all" , "-v", "threadtime", "-s", "am_proc_start", "Magisk", NULL);
@ -61,6 +63,8 @@ static void *magisk_log_thread(void *args) {
// Register our listener // Register our listener
logcat_events[LOG_EVENT] = pipefd[1]; logcat_events[LOG_EVENT] = pipefd[1];
LOGD("log_monitor: magisk log dumper start");
for (char *line; xxread(pipefd[0], &line, sizeof(line)) > 0; free(line)) { for (char *line; xxread(pipefd[0], &line, sizeof(line)) > 0; free(line)) {
char *ss; char *ss;
if ((ss = strstr(line, " Magisk")) && (ss[-1] != 'D') && (ss[-1] != 'V')) { if ((ss = strstr(line, " Magisk")) && (ss[-1] != 'D') && (ss[-1] != 'V')) {
@ -78,7 +82,7 @@ static void *magisk_log_thread(void *args) {
} }
vec_destroy(&logs); vec_destroy(&logs);
} else { } else {
vec_push_back(&logs, line); vec_push_back(&logs, strdup(line));
} }
} }
if (have_data) if (have_data)
@ -95,6 +99,8 @@ static void *debug_magisk_log_thread(void *args) {
if (xpipe2(pipefd, O_CLOEXEC) == -1) if (xpipe2(pipefd, O_CLOEXEC) == -1)
return NULL; return NULL;
LOGD("log_monitor: debug log dumper start");
// Register our listener // Register our listener
logcat_events[DEBUG_EVENT] = pipefd[1]; logcat_events[DEBUG_EVENT] = pipefd[1];