From b30802179a0af4a6328b086d7bcab6fa7d294e3c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 4 Jan 2019 11:43:09 +0000 Subject: [PATCH] Fix concatenation bug in filesystem::path When erasing a trailing empty filename component, the output iterator was not decremented, causing the next component to be created at the wrong position. * src/filesystem/std-path.cc (path::operator+=(const path&)): Fix incorrect treatment of empty filename after trailing slash. * testsuite/27_io/filesystem/path/concat/path.cc: Test problem case. From-SVN: r267574 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/src/filesystem/std-path.cc | 2 +- .../testsuite/27_io/filesystem/path/concat/path.cc | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e6a2dc2ba70..483a60224c9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2019-01-04 Jonathan Wakely + * src/filesystem/std-path.cc (path::operator+=(const path&)): Fix + incorrect treatment of empty filename after trailing slash. + * testsuite/27_io/filesystem/path/concat/path.cc: Test problem case. + * testsuite/21_strings/basic_string/modifiers/assign/char/ move_assign_optim.cc: Avoid spurious failure when -fno-inline added to test flags. diff --git a/libstdc++-v3/src/filesystem/std-path.cc b/libstdc++-v3/src/filesystem/std-path.cc index bf6f37711eb..b7315ad1686 100644 --- a/libstdc++-v3/src/filesystem/std-path.cc +++ b/libstdc++-v3/src/filesystem/std-path.cc @@ -945,7 +945,7 @@ path::operator+=(const path& p) else if (orig_filenamelen == 0 && it != last) { // Remove empty filename at end of original path. - _M_cmpts.erase(std::prev(output)); + _M_cmpts.erase(--output); } if (it != last && it->_M_type() == _Type::_Root_name) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/concat/path.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/concat/path.cc index b653219a7f7..e2a14bd8fcc 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/path/concat/path.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/concat/path.cc @@ -59,9 +59,18 @@ test02() } } +void +test03() +{ + path p = "a/"; + p += path("/b"); + compare_paths(p, "a//b"); +} + int main() { test01(); test02(); + test03(); } -- 2.30.2