From 28a945fee9f4ace3b3f797317d0041485e7f3c64 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 14 Oct 2017 21:09:32 +0800
Subject: [PATCH] Fix SEGFAULT in magisk log dumper

---
 jni/daemon/log_monitor.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jni/daemon/log_monitor.c b/jni/daemon/log_monitor.c
index 2bf515cae..61561dfc7 100644
--- a/jni/daemon/log_monitor.c
+++ b/jni/daemon/log_monitor.c
@@ -25,6 +25,8 @@ static void *logger_thread(void *args) {
 	int log_fd = -1, log_pid;
 	char line[4096];
 
+	LOGD("log_monitor: logger start");
+
 	while (1) {
 		// Start logcat
 		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
 	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)) {
 		char *ss;
 		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);
 				} else {
-					vec_push_back(&logs, line);
+					vec_push_back(&logs, strdup(line));
 				}
 			}
 			if (have_data)
@@ -95,6 +99,8 @@ static void *debug_magisk_log_thread(void *args) {
 	if (xpipe2(pipefd, O_CLOEXEC) == -1)
 		return NULL;
 
+	LOGD("log_monitor: debug log dumper start");
+
 	// Register our listener
 	logcat_events[DEBUG_EVENT] = pipefd[1];