PR libstdc++/85632 fix wraparound in filesystem::space

On 32-bit targets any values over 4GB would wrap and produce the wrong
result.

	PR libstdc++/85632 use uintmax_t for arithmetic
	* src/filesystem/ops.cc (experimental::filesystem::space): Perform
	arithmetic in result type.
	* src/filesystem/std-ops.cc (filesystem::space): Likewise.
	* testsuite/27_io/filesystem/operations/space.cc: Check total capacity
	is greater than free space.
	* testsuite/experimental/filesystem/operations/space.cc: New.

From-SVN: r259901

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f3473016fd56b705ede05ffac816b1f23489a166..c2a224da55bbd375e8d498107a37cf21c6fef552 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,13 @@
 2018-05-03  Jonathan Wakely  <jwakely@redhat.com>
 
+       PR libstdc++/85632 use uintmax_t for arithmetic
+       * src/filesystem/ops.cc (experimental::filesystem::space): Perform
+       arithmetic in result type.
+       * src/filesystem/std-ops.cc (filesystem::space): Likewise.
+       * testsuite/27_io/filesystem/operations/space.cc: Check total capacity
+       is greater than free space.
+       * testsuite/experimental/filesystem/operations/space.cc: New.
+
        * testsuite/20_util/remove_cvref/requirements/alias_decl.cc: New.
        * testsuite/20_util/remove_cvref/requirements/explicit_instantiation.cc:
        New.

diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc
index 328332a8a8295415694a679a507ac5840e83ce93..4a9e265d1d641baefbf614356e3338846f322ae1 100644 (file)
--- a/libstdc++-v3/src/filesystem/ops.cc
+++ b/libstdc++-v3/src/filesystem/ops.cc
@@ -1132,10 +1132,11 @@ fs::space(const path& p, error_code& ec) noexcept
       ec.assign(errno, std::generic_category());
   else
     {
+      uintmax_t fragment_size = f.f_frsize;
       info = space_info{
-       f.f_blocks * f.f_frsize,
-       f.f_bfree * f.f_frsize,
-       f.f_bavail * f.f_frsize
+       f.f_blocks * fragment_size,
+       f.f_bfree * fragment_size,
+       f.f_bavail * fragment_size
       };
       ec.clear();
     }

diff --git a/libstdc++-v3/src/filesystem/std-ops.cc b/libstdc++-v3/src/filesystem/std-ops.cc
index 930b186e88ca5481e7d2f2b60d6765678dab5701..74868cd48e6dddb41185814c5b53f3867ce4095c 100644 (file)
--- a/libstdc++-v3/src/filesystem/std-ops.cc
+++ b/libstdc++-v3/src/filesystem/std-ops.cc
@@ -1378,10 +1378,11 @@ fs::space(const path& p, error_code& ec) noexcept
       ec.assign(errno, std::generic_category());
   else
     {
+      uintmax_t fragment_size = f.f_frsize;
       info = space_info{
-       f.f_blocks * f.f_frsize,
-       f.f_bfree * f.f_frsize,
-       f.f_bavail * f.f_frsize
+       f.f_blocks * fragment_size,
+       f.f_bfree * fragment_size,
+       f.f_bavail * fragment_size
       };
       ec.clear();
     }

diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc
index bdda24183bc1b1f0afaeb025bcb67db82496c996..3d64342fb8f3a5a3eb10b3e1c3ebcfe65f179019 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc
@@ -32,6 +32,7 @@ test01()
   std::error_code ec = make_error_code(std::errc::invalid_argument);
   s = std::filesystem::space("/", ec);
   VERIFY( !ec );
+
   s = std::filesystem::space(__gnu_test::nonexistent_path(), ec);
   VERIFY( ec );
   VERIFY( s.capacity ==  static_cast<uintmax_t>(-1) );
@@ -39,8 +40,16 @@ test01()
   VERIFY( s.available ==  static_cast<uintmax_t>(-1) );
 }
 
+void
+test02()
+{
+  std::filesystem::space_info s = std::filesystem::space(".");
+  VERIFY( s.capacity >= s.free );
+}
+
 int
 main()
 {
   test01();
+  test02();
 }

diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc
new file mode 100644 (file)
index 0000000..aa6a6ae
--- /dev/null
+++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc
@@ -0,0 +1,57 @@
+// Copyright (C) 2017-2018 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-DUSE_FILESYSTEM_TS -lstdc++fs" }
+// { dg-do run { target c++11 } }
+// { dg-require-filesystem-ts "" }
+
+// 30.10.14.3 Permissions [fs.op.space]
+
+#include <experimental/filesystem>
+#include <testsuite_fs.h>
+#include <testsuite_hooks.h>
+
+namespace fs = std::experimental::filesystem;
+
+void
+test01()
+{
+  fs::space_info s = fs::space("/");
+  std::error_code ec = make_error_code(std::errc::invalid_argument);
+  s = fs::space("/", ec);
+  VERIFY( !ec );
+
+  s = fs::space(__gnu_test::nonexistent_path(), ec);
+  VERIFY( ec );
+  VERIFY( s.capacity ==  static_cast<uintmax_t>(-1) );
+  VERIFY( s.free ==  static_cast<uintmax_t>(-1) );
+  VERIFY( s.available ==  static_cast<uintmax_t>(-1) );
+}
+
+void
+test02()
+{
+  fs::space_info s = fs::space(".");
+  VERIFY( s.capacity >= s.free );
+}
+
+int
+main()
+{
+  test01();
+  test02();
+}