diff options
| author |  Reiner Herrmann <reiner@reiner-h.de> | 2017-05-25 11:56:45 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-25 11:56:45 +0200 |
| commit | 8374c7b2c138e4ac2ca4128eff17f6eb49bfcc22 (patch) | |
| tree | 3d54fc04e101525863c6072c838afb6e017afc2e /src | |
| parent | seamonkey profile fixes (diff) | |
| parent | Fix another "subdirname" variable dereference issue (diff) | |
| download | firejail-8374c7b2c138e4ac2ca4128eff17f6eb49bfcc22.tar.gz firejail-8374c7b2c138e4ac2ca4128eff17f6eb49bfcc22.tar.zst firejail-8374c7b2c138e4ac2ca4128eff17f6eb49bfcc22.zip | |
Merge pull request #1307 from thomasjfox/fix-subdirname-dereference
minor bugfix: Correctly dereference "subdirname" variable
Diffstat (limited to 'src')
| -rw-r--r-- | src/firejail/main.c | 2 | ||||
| -rw-r--r-- | src/firejail/profile.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c index 012b2f230..95c325f9f 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
| @@ -1332,7 +1332,7 @@ int main(int argc, char **argv) { | |||
| 1332 | arg_overlay_reuse = 1; | 1332 | arg_overlay_reuse = 1; |
| 1333 | 1333 | ||
| 1334 | char *subdirname = argv[i] + 16; | 1334 | char *subdirname = argv[i] + 16; |
| 1335 | if (subdirname == '\0') { | 1335 | if (*subdirname == '\0') { |
| 1336 | fprintf(stderr, "Error: invalid overlay option\n"); | 1336 | fprintf(stderr, "Error: invalid overlay option\n"); |
| 1337 | exit(1); | 1337 | exit(1); |
| 1338 | } | 1338 | } |
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index 11258892e..cabea05f3 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
| @@ -852,7 +852,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
| 852 | arg_overlay_reuse = 1; | 852 | arg_overlay_reuse = 1; |
| 853 | 853 | ||
| 854 | char *subdirname = ptr + 14; | 854 | char *subdirname = ptr + 14; |
| 855 | if (subdirname == '\0') { | 855 | if (*subdirname == '\0') { |
| 856 | fprintf(stderr, "Error: invalid overlay option\n"); | 856 | fprintf(stderr, "Error: invalid overlay option\n"); |
| 857 | exit(1); | 857 | exit(1); |
| 858 | } | 858 | } |