From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 19 Aug 2021 10:03:01 +0000 (+0100)
Subject: libstdc++: Improve overflow check for file timestamps
X-Git-Tag: basepoints/gcc-13~5294
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65441d8fc3c132a58c8bef6faefa2bc25e82a913;p=thirdparty%2Fgcc.git

libstdc++: Improve overflow check for file timestamps

The current code assumes that system_clock::duration is nanoseconds, and
also performs a value-changing conversion from nanoseconds::max() to
double (which doesn't matter after dividing by 1e9, but triggers a
warning with Clang nonetheless).

A better solution is to use system_clock::duration::max() and perform
the comparison entirely using the std::chrono types, rather than with
dimensionless arithmetic types.

This doesn't address the FIXME in the function, so the overflow check
still rejects some values that could be represented by the file_clock.

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

libstdc++-v3/ChangeLog:

	* src/filesystem/ops-common.h (filesystem::file_time): Improve
	overflow check by using system_clock::duration::max().
---

diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h
index 304e5b263fb7..bf26c06b7b5c 100644
--- a/libstdc++-v3/src/filesystem/ops-common.h
+++ b/libstdc++-v3/src/filesystem/ops-common.h
@@ -229,7 +229,7 @@ namespace __gnu_posix
     // (This only applies to the C++17 Filesystem library, because for the
     // Filesystem TS we don't have a distinct __file_clock, we just use the
     // system clock for file timestamps).
-    if (s >= (nanoseconds::max().count() / 1e9))
+    if (seconds{s} >= floor<seconds>(system_clock::duration::max()))
       {
 	ec = std::make_error_code(std::errc::value_too_large); // EOVERFLOW
 	return system_clock::time_point::min();