song/Filter: try ParseISO8601() first

Prepare for allowing ISO8601 time stamps without delimiters, such as 20191216, and prevent them from being interpreted as numeric UNIX time stamps.

song/Filter: try ParseISO8601() first
b7744be2 · Max Kellermann · 63c5d660 · b7744be2
Commit b7744be2 authored Dec 16, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 8 deletions

Filter.cxx src/song/Filter.cxx +13 -8

No files found.
--- a/src/song/Filter.cxx
+++ b/src/song/Filter.cxx
@@ -113,14 +113,19 @@ ParseTimeStamp(const char *s)
 {
 	assert(s != nullptr);

-	char *endptr;
-	unsigned long long value = strtoull(s, &endptr, 10);
-	if (*endptr == 0 && endptr > s)
-		/* it's an integral UNIX time stamp */
-		return std::chrono::system_clock::from_time_t((time_t)value);
-
-	/* try ISO 8601 */
-	return ParseISO8601(s).first;
+	try {
+		/* try ISO 8601 */
+		return ParseISO8601(s).first;
+	} catch (...) {
+		char *endptr;
+		unsigned long long value = strtoull(s, &endptr, 10);
+		if (*endptr == 0 && endptr > s)
+			/* it's an integral UNIX time stamp */
+			return std::chrono::system_clock::from_time_t((time_t)value);
+
+		/* rethrow the ParseISO8601() error */
+		throw;
+	}
 }

 static constexpr bool