2 files changed, 9 insertions, 18 deletions

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index a49e56ad2..a744b8d80 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,22 +1,9 @@
-CC=@CC@
-PREFIX=@prefix@
-VERSION=@PACKAGE_VERSION@
-NAME=@PACKAGE_NAME@
-HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
-HAVE_GCOV=@HAVE_GCOV@
-EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@
-
-H_FILE_LIST       = $(sort $(wildcard *.[h]))
-C_FILE_LIST       = $(sort $(wildcard *.c))
-OBJS = $(C_FILE_LIST:.c=.o)
-BINOBJS =  $(foreach file, $(OBJS), $file)
-CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DLIBDIR='"$(libdir)"' $(HAVE_GCOV) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
-LDFLAGS:=-pic -Wl,-z,relro -Wl,-z,now
+include ../common.mk
 
 all: $(OBJS)
 
 %.o : %.c $(H_FILE_LIST)
-        $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
 clean:; rm -f $(OBJS) *.gcov *.gcda *.gcno
 
diff --git a/src/lib/pid.c b/src/lib/pid.c
index f138efc8c..3c804716d 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -188,10 +188,11 @@ static void print_elem(unsigned index, int nowrap) {
         uid_t uid = pids[index].uid;
         char *cmd = pid_proc_cmdline(index);
         char *user = pid_get_user_name(uid);
-        char *allocated = user;
+        char *user_allocated = user;
 
         // extract sandbox name - pid == index
         char *sandbox_name = "";
+        char *sandbox_name_allocated = NULL;
         char *fname;
         if (asprintf(&fname, "%s/%d", RUN_FIREJAIL_NAME_DIR, index) == -1)
                 errExit("asprintf");
@@ -202,6 +203,7 @@ static void print_elem(unsigned index, int nowrap) {
                         sandbox_name = malloc(s.st_size + 1);
                         if (!sandbox_name)
                                 errExit("malloc");
+                        sandbox_name_allocated = sandbox_name;
                         char *rv = fgets(sandbox_name, s.st_size + 1, fp);
                         if (!rv)
                                 *sandbox_name = '\0';
@@ -241,8 +243,10 @@ static void print_elem(unsigned index, int nowrap) {
                 else
                         printf("%s%u:\n", indent, index);
         }
-        if (allocated)
-                free(allocated);
+        if (user_allocated)
+                free(user_allocated);
+        if (sandbox_name_allocated)
+                free(sandbox_name_allocated);
 }
 
 // recursivity!!!