aboutsummaryrefslogtreecommitdiffstats
path: root/src/libtracelog/libtracelog.c
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-11-26 10:25:06 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2016-11-26 10:25:06 -0500
commitfa79162b5eada1d0b9daa11ca327d65b42ed1b71 (patch)
treecf3ffcb86bf930bbb03c6ac3f57e1677eeaa1ea6 /src/libtracelog/libtracelog.c
parentssh fix (diff)
downloadfirejail-fa79162b5eada1d0b9daa11ca327d65b42ed1b71.tar.gz
firejail-fa79162b5eada1d0b9daa11ca327d65b42ed1b71.tar.zst
firejail-fa79162b5eada1d0b9daa11ca327d65b42ed1b71.zip
fixes
Diffstat (limited to 'src/libtracelog/libtracelog.c')
-rw-r--r--src/libtracelog/libtracelog.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libtracelog/libtracelog.c b/src/libtracelog/libtracelog.c
index ff884c7d7..ca496d41c 100644
--- a/src/libtracelog/libtracelog.c
+++ b/src/libtracelog/libtracelog.c
@@ -163,9 +163,9 @@ static char *storage_find(const char *str) {
163#define RUN_FSLOGGER_FILE "/run/firejail/mnt/fslogger" 163#define RUN_FSLOGGER_FILE "/run/firejail/mnt/fslogger"
164#define MAXBUF 4096 164#define MAXBUF 4096
165static int blacklist_loaded = 0; 165static int blacklist_loaded = 0;
166static char *sandbox_pid_str = 0; 166static char *sandbox_pid_str = NULL;
167static char *sandbox_name_str = NULL; 167static char *sandbox_name_str = NULL;
168void load_blacklist(void) { 168static void load_blacklist(void) {
169 if (blacklist_loaded) 169 if (blacklist_loaded)
170 return; 170 return;
171 171
@@ -184,13 +184,15 @@ void load_blacklist(void) {
184 char *ptr = strchr(buf, '\n'); 184 char *ptr = strchr(buf, '\n');
185 if (ptr) 185 if (ptr)
186 *ptr = '\0'; 186 *ptr = '\0';
187 sandbox_pid_str = strdup(buf + 13); 187 if (sandbox_pid_str == NULL)
188 sandbox_pid_str = strdup(buf + 13);
188 } 189 }
189 else if (strncmp(buf, "sandbox name: ", 14) == 0) { 190 else if (strncmp(buf, "sandbox name: ", 14) == 0) {
190 char *ptr = strchr(buf, '\n'); 191 char *ptr = strchr(buf, '\n');
191 if (ptr) 192 if (ptr)
192 *ptr = '\0'; 193 *ptr = '\0';
193 sandbox_name_str = strdup(buf + 14); 194 if (sandbox_name_str == NULL);
195 sandbox_name_str = strdup(buf + 14);
194 } 196 }
195 else if (strncmp(buf, "blacklist ", 10) == 0) { 197 else if (strncmp(buf, "blacklist ", 10) == 0) {
196 char *ptr = strchr(buf, '\n'); 198 char *ptr = strchr(buf, '\n');