* Reject durations containing invalid characters (like "1day" instead of "1d").

[srvx.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index d4dee86d65e221cd39357f1121752dce95e845ad..983fe9fbddcd72c436e8ba04049b61b946e97854 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -794,12 +794,14 @@ ParseInterval(const char *interval)
 
     /* process the string, resetting the count if we find a unit character */
     while ((c = *interval++)) {
-       if (isdigit((int)c)) {
-           partial = partial*10 + c - '0';
-       } else {
-           seconds += TypeLength(c) * partial;
-           partial = 0;
-       }
+        if (isdigit((int)c)) {
+            partial = partial*10 + c - '0';
+        } else if (strchr("yMwdhms", c)) {
+            seconds += TypeLength(c) * partial;
+            partial = 0;
+        } else {
+            return 0;
+        }
     }
     /* assume the last chunk is seconds (the normal case) */
     return seconds + partial;