3 files changed, 39 insertions, 3 deletions

diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 2e176d2cd..2b4785fd4 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -25,6 +25,7 @@ Natron
 PCSX2
 PPSSPPQt
 PPSSPPSDL
+Postman
 QMediathekView
 QOwnNotes
 Screenshot
@@ -421,6 +422,7 @@ ipcalc
 ipcalc-ng
 iridium
 iridium-browser
+jami
 jd-gui
 jdownloader
 jerry
@@ -682,6 +684,7 @@ plv
 pngquant
 polari
 porn-cli
+postman
 ppsspp
 pragha
 presentations18
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 02315cfc2..2cde75463 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -525,7 +525,6 @@ int macro_id(const char *name);
 
 
 // util.c
-int invalid_name(const char *name);
 void errLogExit(char* fmt, ...) __attribute__((noreturn));
 void fwarning(char* fmt, ...);
 void fmessage(char* fmt, ...);
@@ -581,6 +580,13 @@ int has_handler(pid_t pid, int signal);
 void enter_network_namespace(pid_t pid);
 int read_pid(const char *name, pid_t *pid);
 pid_t require_pid(const char *name);
+int ascii_isalnum(unsigned char c);
+int ascii_isalpha(unsigned char c);
+int ascii_isdigit(unsigned char c);
+int ascii_islower(unsigned char c);
+int ascii_isupper(unsigned char c);
+int ascii_isxdigit(unsigned char c);
+int invalid_name(const char *name);
 void check_homedir(const char *dir);
 
 // Get info regarding the last kernel mount operation from /proc/self/mountinfo
diff --git a/src/firejail/util.c b/src/firejail/util.c
index cda99e432..b2a0c85f1 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -1448,15 +1448,42 @@ static int has_link(const char *dir) {
         return 0;
 }
 
+int ascii_isalnum(unsigned char c) {
+        return (ascii_isalpha(c) || ascii_isdigit(c));
+}
+
+int ascii_isalpha(unsigned char c) {
+        return (ascii_islower(c) || ascii_isupper(c));
+}
+
+int ascii_isdigit(unsigned char c) {
+        return (c >= '0' && c <= '9');
+}
+
+int ascii_islower(unsigned char c) {
+        return (c >= 'a' && c <= 'z');
+}
+
+int ascii_isupper(unsigned char c) {
+        return (c >= 'A' && c <= 'Z');
+}
+
+int ascii_isxdigit(unsigned char c) {
+        int ret = (ascii_isdigit(c) ||
+                  (c >= 'a' && c <= 'f') ||
+                  (c >= 'A' && c <= 'F'));
+        return ret;
+}
+
 // allow strict ASCII letters and numbers; names with only numbers are rejected; spaces are rejected
 int invalid_name(const char *name) {
         const char *c = name;
 
         int only_numbers = 1;
         while (*c) {
-                if (!isalnum(*c))
+                if (!ascii_isalnum(*c))
                         return 1;
-                if (!isdigit(*c))
+                if (!ascii_isdigit(*c))
                         only_numbers = 0;
                 ++c;
         }