diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-08-06 18:44:50 +0100 |
|---|---|---|
| committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-17 15:07:45 -0300 |
| commit | 080673c0d1557f87d3a28fd63054ca5a0c1c8f1c (patch) | |
| tree | 02d9f02c219a94cc875857bfa45e9915daecf99b | |
| parent | da3d64a7cde5326c90319eb686f322213d32165b (diff) | |
| download | gcc-080673c0d1557f87d3a28fd63054ca5a0c1c8f1c.zip gcc-080673c0d1557f87d3a28fd63054ca5a0c1c8f1c.tar.gz gcc-080673c0d1557f87d3a28fd63054ca5a0c1c8f1c.tar.bz2 | |
libstdc++: Fix unnecessary allocations in read_symlink [PR 96484]
libstdc++-v3/ChangeLog:
PR libstdc++/96484
* src/c++17/fs_ops.cc (fs::read_symlink): Return an error
immediately for non-symlinks.
* src/filesystem/ops.cc (fs::read_symlink): Likewise.
| -rw-r--r-- | libstdc++-v3/src/c++17/fs_ops.cc | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/filesystem/ops.cc | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index 873f93a..c685b18 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -1180,6 +1180,12 @@ fs::path fs::read_symlink(const path& p, error_code& ec) ec.assign(errno, std::generic_category()); return result; } + else if (!fs::is_symlink(make_file_status(st))) + { + ec.assign(EINVAL, std::generic_category()); + return result; + } + std::string buf(st.st_size ? st.st_size + 1 : 128, '\0'); do { diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index 29ea9c0..8c8854b 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -998,6 +998,12 @@ fs::path fs::read_symlink(const path& p [[gnu::unused]], error_code& ec) ec.assign(errno, std::generic_category()); return result; } + else if (!fs::is_symlink(make_file_status(st))) + { + ec.assign(EINVAL, std::generic_category()); + return result; + } + std::string buf(st.st_size ? st.st_size + 1 : 128, '\0'); do { |