2 files changed, 3 insertions, 10 deletions

diff --git a/src/libpostexecseccomp/libpostexecseccomp.c b/src/libpostexecseccomp/libpostexecseccomp.c
index 3983510ec..b2f64f18e 100644
--- a/src/libpostexecseccomp/libpostexecseccomp.c
+++ b/src/libpostexecseccomp/libpostexecseccomp.c
@@ -40,9 +40,7 @@ static void load_seccomp(void) {
                 return;
         }
         unsigned short entries = (unsigned short) size / (unsigned short) sizeof(struct sock_filter);
-        struct sock_filter *filter = MAP_FAILED;
-        if (size != 0)
-                filter = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+        struct sock_filter *filter = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
         close(fd);
 
         if (filter == MAP_FAILED) {
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c
index e252e9d26..1cab1ed3c 100644
--- a/src/libtrace/libtrace.c
+++ b/src/libtrace/libtrace.c
@@ -64,14 +64,9 @@ void init(void) {
                 strncpy(myname, "unknown", MAXNAME-1);
 
         // read file
-        FILE *fp  = orig_fopen(fname, "r");
-        if (!fp)
+        FILE *fp = orig_fopen(fname, "r");
+        if (!fp || fgets(myname, MAXNAME, fp) == NULL)
                 strncpy(myname, "unknown", MAXNAME-1);
-        if (fgets(myname, MAXNAME, fp) == NULL) {
-                fclose(fp);
-                free(fname);
-                strncpy(myname, "unknown", MAXNAME-1);
-        }
 
         // clean '\n'
         char *ptr = strchr(myname, '\n');