sar/sadf: Strengthen tests made on args given to options -s/-e (#350)

Make additional tests on the argument following options -s and -s used
with sar and sadf to make sure it is actually a timestamp before using
it as such.
Previously, in the examples below, xfile (5 chars) and my_xfile (8
chars) were considered as timestamps in parse_timestamp() function,
although they actually are data files names.

sadf -s xfile
or
sadf -s my_xfile

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/sa_common.c b/sa_common.c
index cdfa50bd53c437d5185711bbccaedc7982ee8609..b6f3d6ce79f0859fa43b9120f9bf219a0db0c834 100644 (file)
--- a/sa_common.c
+++ b/sa_common.c
@@ -629,6 +629,12 @@ int next_slice(unsigned long long uptime_ref, unsigned long long uptime,
 int decode_timestamp(char timestamp[], struct tstamp *tse)
 {
        timestamp[2] = timestamp[5] = '\0';
+
+       if ((strspn(timestamp, DIGITS) != 2) ||
+           (strspn(&timestamp[3], DIGITS) != 2) ||
+           (strspn(&timestamp[6], DIGITS) != 2))
+               return 1;
+
        tse->tm_sec  = atoi(&timestamp[6]);
        tse->tm_min  = atoi(&timestamp[3]);
        tse->tm_hour = atoi(timestamp);
@@ -747,32 +753,40 @@ int parse_timestamp(char *argv[], int *opt, struct tstamp *tse,
                    const char *def_timestamp, uint64_t flags)
 {
        char timestamp[11];
+       int ok = FALSE;
 
-       if (argv[++(*opt)]) {
+       if (argv[++(*opt)] && strncmp(argv[*opt], "-", 1)) {
                switch (strlen(argv[*opt])) {
 
                        case 5:
+                               if (argv[*opt][2] != ':')
+                                       break;
                                strncpy(timestamp, argv[(*opt)++], 5);
                                timestamp[5] = '\0';
                                strcat(timestamp, ":00");
+                               ok = TRUE;
                                break;
 
                        case 8:
+                               if ((argv[*opt][2] != ':') || (argv[*opt][5] != ':'))
+                                       break;
                                strncpy(timestamp, argv[(*opt)++], 8);
+                               ok = TRUE;
                                break;
 
                        case 10:
-                               strncpy(timestamp, argv[(*opt)++], 10);
-                               timestamp[10] = '\0';
+                               if (strspn(argv[*opt], DIGITS) == 10) {
+                                       /* This is actually a timestamp */
+                                       strncpy(timestamp, argv[(*opt)++], 10);
+                                       timestamp[10] = '\0';
 
-                               return decode_epoch(timestamp, tse, flags);
-
-                       default:
-                               strncpy(timestamp, def_timestamp, 8);
+                                       return decode_epoch(timestamp, tse, flags);
+                               }
                                break;
                }
        }
-       else {
+
+       if (!ok) {
                strncpy(timestamp, def_timestamp, 8);
        }
        timestamp[8] = '\0';