diff options
author | netblue30 <netblue30@yahoo.com> | 2016-11-27 18:10:50 -0500 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-11-27 18:10:50 -0500 |
commit | 4ea68a4e03592d1c685f760f66eebe3018536416 (patch) | |
tree | 950649bfa28b6f56bb4991c46eed8bd2ca3eae40 /src/firejail/netfilter.c | |
parent | fixes (diff) | |
download | firejail-4ea68a4e03592d1c685f760f66eebe3018536416.tar.gz firejail-4ea68a4e03592d1c685f760f66eebe3018536416.tar.zst firejail-4ea68a4e03592d1c685f760f66eebe3018536416.zip |
cleanup
Diffstat (limited to 'src/firejail/netfilter.c')
-rw-r--r-- | src/firejail/netfilter.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/firejail/netfilter.c b/src/firejail/netfilter.c index 0136ab1f8..43f08e45b 100644 --- a/src/firejail/netfilter.c +++ b/src/firejail/netfilter.c | |||
@@ -85,12 +85,14 @@ void netfilter(const char *fname) { | |||
85 | filter = malloc(size + 1); // + '\0' | 85 | filter = malloc(size + 1); // + '\0' |
86 | if (filter == NULL) | 86 | if (filter == NULL) |
87 | goto errexit; | 87 | goto errexit; |
88 | memset(&filter[0], 0, sizeof(filter)); | 88 | memset(filter, 0, size + 1); |
89 | int rd = 0; | 89 | int rd = 0; |
90 | while (rd < size) { | 90 | while (rd < size) { |
91 | int rv = read(fd, (unsigned char *) filter + rd, size - rd); | 91 | int rv = read(fd, (unsigned char *) filter + rd, size - rd); |
92 | if (rv == -1) | 92 | if (rv == -1) { |
93 | close(fd); | ||
93 | goto errexit; | 94 | goto errexit; |
95 | } | ||
94 | rd += rv; | 96 | rd += rv; |
95 | } | 97 | } |
96 | 98 | ||
@@ -207,7 +209,7 @@ void netfilter6(const char *fname) { | |||
207 | filter = malloc(size + 1); // + '\0' | 209 | filter = malloc(size + 1); // + '\0' |
208 | if (filter == NULL) | 210 | if (filter == NULL) |
209 | goto errexit; | 211 | goto errexit; |
210 | memset(&filter[0], 0, sizeof(filter)); | 212 | memset(filter, 0, size + 1); |
211 | int rd = 0; | 213 | int rd = 0; |
212 | while (rd < size) { | 214 | while (rd < size) { |
213 | int rv = read(fd, (unsigned char *) filter + rd, size - rd); | 215 | int rv = read(fd, (unsigned char *) filter + rd, size - rd); |