parse-util: make sure "3.+1s" or "3. 1s" are not considered valid time specification

[thirdparty/systemd.git] / src / basic / time-util.c

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 2eff230c6898afaa37a66d995e3171a91370f559..81d3f3f38f77a7c8dc384d52f113d229b2ab1a26 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -1023,7 +1024,8 @@ int parse_time(const char *t, usec_t *usec, usec_t default_unit) {
                 if (*e == '.') {
                         char *b = e + 1;
 
-                        if (*b == '-') /* Don't allow 0.-0 */
+                        /* Don't allow "0.-0", "3.+1" or "3. 1" */
+                        if (*b == '-' || *b == '+' || isspace(*b))
                                 return -EINVAL;
 
                         errno = 0;
@@ -1161,7 +1163,7 @@ int parse_nsec(const char *t, nsec_t *nsec) {
                 if (*e == '.') {
                         char *b = e + 1;
 
-                        if (*b == '-')
+                        if (*b == '-' || *b == '+' || isspace(*b))
                                 return -EINVAL;
 
                         errno = 0;