Fix timestamp parser in new load_stats_file.

The previous parser only considered stats files _starting_ with the
timestamp tag, not stats files having the timestamp tag in a later
position. While this applies to all current stats files, a future
stats file might look differently. Better to fix the function now than
be surprised in another 9 years from now.

This commit also adds a test case for such future stats, and it fixes
stats file paths in newly added unit tests.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index abe23f9aae..e018561556 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -3176,12 +3176,12 @@ load_stats_file(const char *filename, const char *ts_tag, time_t now,
       goto end;
     }
     /* Do we have enough for parsing a timestamp? */
-    if (strlen(contents) < strlen(ts_tag) + 1 + sizeof(timestr)) {
+    if (strlen(ts_tok) < strlen(ts_tag) + 1 + sizeof(timestr)) {
       log_warn(LD_BUG, "Token %s malformed in file %s", ts_tag, filename);
       goto end;
     }
     /* Parse timestamp in order to validate it is not too old. */
-    strlcpy(timestr, contents + strlen(ts_tag) + 1, sizeof(timestr));
+    strlcpy(timestr, ts_tok + strlen(ts_tag) + 1, sizeof(timestr));
     if (parse_iso_time(timestr, &written) < 0) {
       log_warn(LD_BUG, "Token %s has a malformed timestamp in file %s",
                ts_tag, filename);