merge: disallow zero seconds timeout

2 files changed, 7 insertions, 0 deletions

diff --git a/src/firejail/util.c b/src/firejail/util.c
index 112307ebc..7e3f89121 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -959,6 +959,12 @@ unsigned extract_timeout(const char *str) {
                 exit(1);
         }
 
+        unsigned timeout = h * 3600 + m * 60 + s;
+        if (timeout == 0) {
+                fprintf(stderr, "Error: invalid timeout\n");
+                exit(1);
+        }
+
         return h * 3600 + m * 60 + s;
 }
 
diff --git a/status b/status
index fb8d548b7..5636b30fc 100644
--- a/status
+++ b/status
@@ -1,3 +1,4 @@
+Jan 19: disallow zero seconds timeout
 
 Jan 9: fix netfilter-default functionality in /etc/firejail/firejail.config
 Jan 8: test caps join