mainline merge

3 files changed, 18 insertions, 3 deletions

diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c
index 71b39390e..f09a23977 100644
--- a/src/firecfg/desktop_files.c
+++ b/src/firecfg/desktop_files.c
@@ -144,6 +144,8 @@ void fix_desktop_files(char *homedir) {
                 perror("opendir");
                 fprintf(stderr, "Warning: cannot access /usr/share/applications directory, desktop files fixing skipped...\n");
                 free(user_apps_dir);
+                if (dir)
+                        closedir(dir);
                 return;
         }
 
@@ -182,7 +184,9 @@ void fix_desktop_files(char *homedir) {
                 }
 
                 fseek(fp, 0, SEEK_END);
-                size_t size = ftell(fp);
+                long size = ftell(fp);
+                if (size == -1)
+                        errExit("ftell");
                 fseek(fp, 0, SEEK_SET);
                 char *buf = malloc(size + 1);
                 if (!buf)
@@ -266,12 +270,16 @@ void fix_desktop_files(char *homedir) {
 
                 if (stat(outname, &sb) == 0) {
                         printf("   %s skipped: file exists\n", filename);
+                        if (change_exec)
+                                free(change_exec);
                         continue;
                 }
 
                 FILE *fpin = fopen(filename, "r");
                 if (!fpin) {
                         fprintf(stderr, "Warning: cannot open /usr/share/applications/%s\n", filename);
+                        if (change_exec)
+                                free(change_exec);
                         continue;
                 }
 
@@ -279,6 +287,8 @@ void fix_desktop_files(char *homedir) {
                 if (!fpout) {
                         fprintf(stderr, "Warning: cannot open ~/.local/share/applications/%s\n", outname);
                         fclose(fpin);
+                        if (change_exec)
+                                free(change_exec);
                         continue;
                 }
                 fprintf(fpout, "# converted by firecfg\n");
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 0bbafb343..676c2d90a 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -10,6 +10,7 @@ Discord
 DiscordCanary
 FossaMail
 Fritzing
+JDownloader
 Mathematica
 Natron
 Telegram
@@ -94,6 +95,7 @@ deadbeef
 deluge
 dex2jar
 dia
+dig
 digikam
 dillo
 dino
@@ -217,6 +219,7 @@ inox
 iridium
 iridium-browser
 jd-gui
+jdownloader
 jitsi
 k3b
 kaffeine
@@ -442,6 +445,7 @@ weechat
 weechat-curses
 wesnoth
 wget
+whois
 wine
 wire-desktop
 wireshark
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 298314d4f..810af6ff2 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -318,13 +318,14 @@ int main(int argc, char **argv) {
 
         // user setup
         char *user = get_user();
+        assert(user);
         uid_t uid;
         gid_t gid;
         char *home = get_homedir(user, &uid, &gid);
 
 
         // check for --bindir
-        for (i = i; i < argc; i++) {
+        for (i = 1; i < argc; i++) {
                 if (strncmp(argv[i], "--bindir=", 9) == 0) {
                         if (strncmp(argv[i] + 9, "~/", 2) == 0) {
                                 if (asprintf(&arg_bindir, "%s/%s", home, argv[i] + 11) == -1)
@@ -430,7 +431,7 @@ int main(int argc, char **argv) {
         set_links_firecfg();
 
         // add user to firejail access database - only for root
-        if (user && getuid() == 0) {
+        if (getuid() == 0) {
                 printf("\nAdding user %s to Firejail access database in %s/firejail.users\n", user, SYSCONFDIR);
                 firejail_user_add(user);
         }