diff options
author | smitsohu <smitsohu@gmail.com> | 2018-08-11 21:59:59 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2018-08-11 21:59:59 +0200 |
commit | f6d6204aba7ef933f2b8870953f2926c3123a6e4 (patch) | |
tree | 349c19e146314b1c47b742201e0cdb26e4664d97 | |
parent | release 0.9.56~rc1 testing (diff) | |
download | firejail-f6d6204aba7ef933f2b8870953f2926c3123a6e4.tar.gz firejail-f6d6204aba7ef933f2b8870953f2926c3123a6e4.tar.zst firejail-f6d6204aba7ef933f2b8870953f2926c3123a6e4.zip |
clear all warnings from cppcheck static code analysis
obtained with: cppcheck --enable=warning --force --inconclusive --quiet ~/firejail/src
-rw-r--r-- | src/firejail/join.c | 2 | ||||
-rw-r--r-- | src/firejail/profile.c | 3 | ||||
-rw-r--r-- | src/firejail/sandbox.c | 4 | ||||
-rw-r--r-- | src/firemon/arp.c | 2 | ||||
-rw-r--r-- | src/firemon/route.c | 6 | ||||
-rw-r--r-- | src/fnetfilter/main.c | 2 | ||||
-rw-r--r-- | src/libtracelog/libtracelog.c | 15 |
7 files changed, 17 insertions, 17 deletions
diff --git a/src/firejail/join.c b/src/firejail/join.c index e6da4c248..a75262711 100644 --- a/src/firejail/join.c +++ b/src/firejail/join.c | |||
@@ -49,7 +49,7 @@ static void extract_x11_display(pid_t pid) { | |||
49 | if (!fp) | 49 | if (!fp) |
50 | return; | 50 | return; |
51 | 51 | ||
52 | if (1 != fscanf(fp, "%d", &display)) { | 52 | if (1 != fscanf(fp, "%u", &display)) { |
53 | fprintf(stderr, "Error: cannot read X11 display file\n"); | 53 | fprintf(stderr, "Error: cannot read X11 display file\n"); |
54 | fclose(fp); | 54 | fclose(fp); |
55 | return; | 55 | return; |
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index 60f3f86ee..606378908 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -93,9 +93,6 @@ void profile_add_ignore(const char *str) { | |||
93 | fprintf(stderr, "Error: invalid ignore option\n"); | 93 | fprintf(stderr, "Error: invalid ignore option\n"); |
94 | exit(1); | 94 | exit(1); |
95 | } | 95 | } |
96 | char *ptr = strdup(str); | ||
97 | if (!ptr) | ||
98 | errExit("strdup"); | ||
99 | 96 | ||
100 | // find an empty entry in profile_ignore array | 97 | // find an empty entry in profile_ignore array |
101 | int i; | 98 | int i; |
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 66881c040..2c28aa24b 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c | |||
@@ -250,7 +250,7 @@ static int monitor_application(pid_t app_pid) { | |||
250 | } | 250 | } |
251 | while(rv != monitored_pid); | 251 | while(rv != monitored_pid); |
252 | if (arg_debug) | 252 | if (arg_debug) |
253 | printf("Sandbox monitor: waitpid %u retval %d status %d\n", monitored_pid, rv, status); | 253 | printf("Sandbox monitor: waitpid %d retval %d status %d\n", monitored_pid, rv, status); |
254 | if (rv == -1) { // we can get here if we have processes joining the sandbox (ECHILD) | 254 | if (rv == -1) { // we can get here if we have processes joining the sandbox (ECHILD) |
255 | if (arg_debug) | 255 | if (arg_debug) |
256 | perror("waitpid"); | 256 | perror("waitpid"); |
@@ -294,7 +294,7 @@ static int monitor_application(pid_t app_pid) { | |||
294 | closedir(dir); | 294 | closedir(dir); |
295 | 295 | ||
296 | if (monitored_pid != 0 && arg_debug) | 296 | if (monitored_pid != 0 && arg_debug) |
297 | printf("Sandbox monitor: monitoring %u\n", monitored_pid); | 297 | printf("Sandbox monitor: monitoring %d\n", monitored_pid); |
298 | } | 298 | } |
299 | 299 | ||
300 | // return the latest exit status. | 300 | // return the latest exit status. |
diff --git a/src/firemon/arp.c b/src/firemon/arp.c index aac1aeba3..9f3e50e94 100644 --- a/src/firemon/arp.c +++ b/src/firemon/arp.c | |||
@@ -51,7 +51,7 @@ static void print_arp(const char *fname) { | |||
51 | char mac[64]; | 51 | char mac[64]; |
52 | char mask[64]; | 52 | char mask[64]; |
53 | char device[64]; | 53 | char device[64]; |
54 | int rv = sscanf(start, "%s %s %s %s %s %s\n", ip, type, flags, mac, mask, device); | 54 | int rv = sscanf(start, "%63s %63s %63s %63s %63s %63s\n", ip, type, flags, mac, mask, device); |
55 | if (rv != 6) | 55 | if (rv != 6) |
56 | continue; | 56 | continue; |
57 | 57 | ||
diff --git a/src/firemon/route.c b/src/firemon/route.c index 7426637df..6db212831 100644 --- a/src/firemon/route.c +++ b/src/firemon/route.c | |||
@@ -144,7 +144,7 @@ static void print_route(const char *fname) { | |||
144 | char use[64]; | 144 | char use[64]; |
145 | char metric[64]; | 145 | char metric[64]; |
146 | char mask[64]; | 146 | char mask[64]; |
147 | int rv = sscanf(start, "%s %s %s %s %s %s %s %s\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); | 147 | int rv = sscanf(start, "%63s %63s %63s %63s %63s %63s %63s %63s\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); |
148 | if (rv != 8) | 148 | if (rv != 8) |
149 | continue; | 149 | continue; |
150 | 150 | ||
@@ -161,7 +161,7 @@ static void print_route(const char *fname) { | |||
161 | 161 | ||
162 | // printf("#%s# #%s# #%s# #%s# #%s# #%s# #%s# #%s#\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); | 162 | // printf("#%s# #%s# #%s# #%s# #%s# #%s# #%s# #%s#\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); |
163 | if (gw != 0) | 163 | if (gw != 0) |
164 | printf(" %u.%u.%u.%u/%u via %u.%u.%u.%u, dev %s, metric %s\n", | 164 | printf(" %d.%d.%d.%d/%u via %d.%d.%d.%d, dev %s, metric %s\n", |
165 | PRINT_IP(destip), mask2bits(destmask), | 165 | PRINT_IP(destip), mask2bits(destmask), |
166 | PRINT_IP(gw), | 166 | PRINT_IP(gw), |
167 | ifname, | 167 | ifname, |
@@ -169,7 +169,7 @@ static void print_route(const char *fname) { | |||
169 | else { // this is an interface | 169 | else { // this is an interface |
170 | IfList *ifentry = list_find(destip, destmask); | 170 | IfList *ifentry = list_find(destip, destmask); |
171 | if (ifentry) { | 171 | if (ifentry) { |
172 | printf(" %u.%u.%u.%u/%u, dev %s, scope link src %d.%d.%d.%d\n", | 172 | printf(" %d.%d.%d.%d/%u, dev %s, scope link src %d.%d.%d.%d\n", |
173 | PRINT_IP(destip), mask2bits(destmask), | 173 | PRINT_IP(destip), mask2bits(destmask), |
174 | ifname, | 174 | ifname, |
175 | PRINT_IP(ifentry->ip)); | 175 | PRINT_IP(ifentry->ip)); |
diff --git a/src/fnetfilter/main.c b/src/fnetfilter/main.c index ba58ba3c9..d8b950e8f 100644 --- a/src/fnetfilter/main.c +++ b/src/fnetfilter/main.c | |||
@@ -125,7 +125,7 @@ for (i = 0; i < argcnt; i++) | |||
125 | else { | 125 | else { |
126 | // parsing | 126 | // parsing |
127 | int index = 0; | 127 | int index = 0; |
128 | int rv = sscanf(ptr, "$ARG%u", &index) ; | 128 | int rv = sscanf(ptr, "$ARG%d", &index) ; |
129 | if (rv != 1) { | 129 | if (rv != 1) { |
130 | fprintf(stderr, "Error fnetfilter: invalid template argument on line %d\n", line); | 130 | fprintf(stderr, "Error fnetfilter: invalid template argument on line %d\n", line); |
131 | exit(1); | 131 | exit(1); |
diff --git a/src/libtracelog/libtracelog.c b/src/libtracelog/libtracelog.c index 5ce41aca0..0f8d5a00d 100644 --- a/src/libtracelog/libtracelog.c +++ b/src/libtracelog/libtracelog.c | |||
@@ -64,9 +64,6 @@ static inline uint32_t hash(const char *str) { | |||
64 | } | 64 | } |
65 | 65 | ||
66 | static void storage_add(const char *str) { | 66 | static void storage_add(const char *str) { |
67 | #ifdef DEBUG | ||
68 | printf("add %s\n", str); | ||
69 | #endif | ||
70 | if (!str) { | 67 | if (!str) { |
71 | #ifdef DEBUG | 68 | #ifdef DEBUG |
72 | printf("null pointer passed to storage_add\n"); | 69 | printf("null pointer passed to storage_add\n"); |
@@ -74,6 +71,10 @@ static void storage_add(const char *str) { | |||
74 | return; | 71 | return; |
75 | } | 72 | } |
76 | 73 | ||
74 | #ifdef DEBUG | ||
75 | printf("add %s\n", str); | ||
76 | #endif | ||
77 | |||
77 | ListElem *ptr = malloc(sizeof(ListElem)); | 78 | ListElem *ptr = malloc(sizeof(ListElem)); |
78 | if (!ptr) { | 79 | if (!ptr) { |
79 | fprintf(stderr, "Error: cannot allocate memory\n"); | 80 | fprintf(stderr, "Error: cannot allocate memory\n"); |
@@ -96,15 +97,17 @@ static void storage_add(const char *str) { | |||
96 | static char* cwd = NULL; | 97 | static char* cwd = NULL; |
97 | 98 | ||
98 | static char *storage_find(const char *str) { | 99 | static char *storage_find(const char *str) { |
99 | #ifdef DEBUG | ||
100 | printf("storage find %s\n", str); | ||
101 | #endif | ||
102 | if (!str) { | 100 | if (!str) { |
103 | #ifdef DEBUG | 101 | #ifdef DEBUG |
104 | printf("null pointer passed to storage_find\n"); | 102 | printf("null pointer passed to storage_find\n"); |
105 | #endif | 103 | #endif |
106 | return NULL; | 104 | return NULL; |
107 | } | 105 | } |
106 | |||
107 | #ifdef DEBUG | ||
108 | printf("storage find %s\n", str); | ||
109 | #endif | ||
110 | |||
108 | const char *tofind = str; | 111 | const char *tofind = str; |
109 | int allocated = 0; | 112 | int allocated = 0; |
110 | 113 | ||