diff options
| author |  Reiner Herrmann <reiner@reiner-h.de> | 2019-07-10 18:24:50 +0200 |
|---|---|---|
| committer | Reiner Herrmann <reiner@reiner-h.de> | 2019-07-10 18:24:50 +0200 |
| commit | c87713e3ffb95f11386792c82a08b5a84a003057 (patch) | |
| tree | ff7702d95c04aa47225e820f2890197c8ea5d649 /src/libtrace | |
| parent | less.profile: make ${HOME} read-only (diff) | |
| download | firejail-c87713e3ffb95f11386792c82a08b5a84a003057.tar.gz firejail-c87713e3ffb95f11386792c82a08b5a84a003057.tar.zst firejail-c87713e3ffb95f11386792c82a08b5a84a003057.zip | |
remove duplicate fclose/free
Diffstat (limited to 'src/libtrace')
| -rw-r--r-- | src/libtrace/libtrace.c | 9 |
1 files changed, 2 insertions, 7 deletions
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) { | |||
| 64 | strncpy(myname, "unknown", MAXNAME-1); | 64 | strncpy(myname, "unknown", MAXNAME-1); |
| 65 | 65 | ||
| 66 | // read file | 66 | // read file |
| 67 | FILE *fp = orig_fopen(fname, "r"); | 67 | FILE *fp = orig_fopen(fname, "r"); |
| 68 | if (!fp) | 68 | if (!fp || fgets(myname, MAXNAME, fp) == NULL) |
| 69 | strncpy(myname, "unknown", MAXNAME-1); | 69 | strncpy(myname, "unknown", MAXNAME-1); |
| 70 | if (fgets(myname, MAXNAME, fp) == NULL) { | ||
| 71 | fclose(fp); | ||
| 72 | free(fname); | ||
| 73 | strncpy(myname, "unknown", MAXNAME-1); | ||
| 74 | } | ||
| 75 | 70 | ||
| 76 | // clean '\n' | 71 | // clean '\n' |
| 77 | char *ptr = strchr(myname, '\n'); | 72 | char *ptr = strchr(myname, '\n'); |