diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-08-06 18:44:50 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-08-06 18:44:50 +0100 |
| commit | 6a13a4e3f29fc4ce5eff96d74ba965c9fdc02184 (patch) | |
| tree | 295380acc23a45173d75aa4e1abdf00dbe430a35 /libstdc++-v3/src | |
| parent | 6251ea15f55ec57d6325c2e37e88b22315aba658 (diff) | |
| download | gcc-6a13a4e3f29fc4ce5eff96d74ba965c9fdc02184.zip gcc-6a13a4e3f29fc4ce5eff96d74ba965c9fdc02184.tar.gz gcc-6a13a4e3f29fc4ce5eff96d74ba965c9fdc02184.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.
Diffstat (limited to 'libstdc++-v3/src')
| -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 { |