grammar issues and fixing test cases for rlimit

6 files changed, 25 insertions, 13 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index 2dfa19ec2..3311224fd 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1489,8 +1489,8 @@ int main(int argc, char **argv, char **envp) {
                 }
                 else if (strncmp(argv[i], "--rlimit-fsize=", 15) == 0) {
                         cfg.rlimit_fsize = parse_arg_size(argv[i] + 15);
-                        if ( cfg.rlimit_fsize == 0 ) {
-                                perror("Error: given rlimit-size is invalid. use only non-negative numbers and k,m,g suffix for size");
+                        if (cfg.rlimit_fsize == 0) {
+                                perror("Error: invalid rlimit-fsize. only use positive numbers and k, m or g suffix.");
                                 exit(1);
                         }
                         arg_rlimit_fsize = 1;
@@ -1502,8 +1502,8 @@ int main(int argc, char **argv, char **envp) {
                 }
                 else if (strncmp(argv[i], "--rlimit-as=", 12) == 0) {
                         cfg.rlimit_as = parse_arg_size(argv[i] + 12);
-                        if ( cfg.rlimit_as == 0 ) {
-                                perror("Error: given rlimit-as is invalid. use only non-negative numbers and k,m,g suffix for size");
+                        if (cfg.rlimit_as == 0) {
+                                perror("Error: invalid rlimit-as. only use positive numbers and k, m or g suffix.");
                                 exit(1);
                         }
                         arg_rlimit_as = 1;
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index e7e7bdfc2..a0d62241e 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1493,8 +1493,8 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 }
                 else if (strncmp(ptr, "rlimit-fsize ", 13) == 0) {
                         cfg.rlimit_fsize = parse_arg_size(ptr + 13);
-                        if ( cfg.rlimit_fsize == 0 ) {
-                                perror("Error: invalid rlimit-fsize in profile file. use only non-negative numbers and k,m,g suffix for size");
+                        if (cfg.rlimit_fsize == 0) {
+                                perror("Error: invalid rlimit-fsize in profile file. only use positive numbers and k, m or g suffix.");
                                 exit(1);
                         }
                         arg_rlimit_fsize = 1;
@@ -1506,8 +1506,8 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 }
                 else if (strncmp(ptr, "rlimit-as ", 10) == 0) {
                         cfg.rlimit_as = parse_arg_size(ptr + 10);
-                        if ( cfg.rlimit_as == 0 ){
-                                perror("Error: invalid rlimit-as size in profile file. use only non-negative numbers and k,m,g suffix for size");
+                        if (cfg.rlimit_as == 0) {
+                                perror("Error: invalid rlimit-as in profile file. only use positive numbers and k, m or g suffix.");
                                 exit(1);
                         }
                         arg_rlimit_as = 1;
diff --git a/src/firejail/util.c b/src/firejail/util.c
index 7ee83a13e..cd1a048fe 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -55,10 +55,22 @@ long long unsigned parse_arg_size(char *str) {
         sscanf(str, "%llu", &result);
 
         char suffix = *(str + len - 1);
+        if (!isdigit(suffix) && ( suffix == 'k' || suffix == 'm' || suffix == 'g')) {
+                len -= 1;
+        }
+
+        /* checks for is value valid positive number */
+        for ( int i = 0; i < len; i++) {
+                if (!isdigit(*(str+i))) {
+                        return 0;
+                }
+        }
+
         if (isdigit(suffix))
                 return result;
 
-        switch (result) {
+
+        switch (suffix) {
         case 'k':
                 result *= 1024;
                 break;
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 9308eecf4..c72a1dbd8 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -2129,7 +2129,7 @@ $ firejail --read-only=~/test --read-write=~/test/a
 .TP
 \fB\-\-rlimit-as=number
 Set the maximum size of the process's virtual memory (address space) in bytes.
-you can use kilobyte(k),megabyte(m) and gigabyte(g) for size suffix. ( they works on base 1024 )
+Use k(ilobyte), m(egabyte) or g(igabyte) for size suffix (base 1024).
 
 .TP
 \fB\-\-rlimit-cpu=number
@@ -2143,7 +2143,7 @@ track of CPU seconds for each process independently.
 .TP
 \fB\-\-rlimit-fsize=number
 Set the maximum file size that can be created by a process.
-you can use kilobyte(k),megabyte(m) and gigabyte(g) for size suffix. ( they works on base 1024 )
+Use k(ilobyte), m(egabyte) or g(igabyte) for size suffix (base 1024).
 .TP
 \fB\-\-rlimit-nofile=number
 Set the maximum number of files that can be opened by a process.
diff --git a/test/environment/rlimit-bad-profile.exp b/test/environment/rlimit-bad-profile.exp
index b838f83f4..2c5793c9d 100755
--- a/test/environment/rlimit-bad-profile.exp
+++ b/test/environment/rlimit-bad-profile.exp
@@ -11,7 +11,7 @@ match_max 100000
 send -- "firejail --profile=rlimit-bad1.profile\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "invalid rlimit"
+        "invalid rlimit-fsize in profile file. only use positive numbers and k, m or g suffix."
 }
 after 100
 
diff --git a/test/environment/rlimit-bad.exp b/test/environment/rlimit-bad.exp
index 3a82ded9b..6bdfd4193 100755
--- a/test/environment/rlimit-bad.exp
+++ b/test/environment/rlimit-bad.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --rlimit-fsize=-1024\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "invalid rlimit"
+        "invalid rlimit-fsize. only use positive numbers and k, m or g suffix."
 }
 after 100