From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1464) id D71693846405; Wed, 19 Aug 2020 13:57:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D71693846405 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1597845447; bh=LvYjTUugTtkXh4EilFax1MnRk8n4vZMWvTrVGWWBca8=; h=From:To:Subject:Date:From; b=Fb0VPkasIgFGexmgrddL6sx8ENnqYwrDB4oUVaNR0aNOjcikJg+JGFggdFJi55CWC V2PvetAshqnATdxwVSirVu+AF6EFMIYEPIdA6DexdUK+odaRZu5ETQa5ucBb0GAa7u x9k6AdrpZK0ApkDvqMgWb9rmYdVhh4RP6nj9DLKU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Peter Bergner To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ibm/heads/gcc-10-branch)] libstdc++: Fix unnecessary allocations in read_symlink [PR 96484] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/vendors/ibm/heads/gcc-10-branch X-Git-Oldrev: ca6c1bda8023d17577f1fca0b406402fbaaba63f X-Git-Newrev: 8b7e7fcb5fff8255122a8fa94109f7ae05aeaa81 Message-Id: <20200819135727.D71693846405@sourceware.org> Date: Wed, 19 Aug 2020 13:57:27 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2020 13:57:27 -0000 https://gcc.gnu.org/g:8b7e7fcb5fff8255122a8fa94109f7ae05aeaa81 commit 8b7e7fcb5fff8255122a8fa94109f7ae05aeaa81 Author: Jonathan Wakely Date: Thu Aug 6 18:44:50 2020 +0100 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. (cherry picked from commit 6a13a4e3f29fc4ce5eff96d74ba965c9fdc02184) Diff: --- libstdc++-v3/src/c++17/fs_ops.cc | 6 ++++++ libstdc++-v3/src/filesystem/ops.cc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index 873f93aacfc..c685b1824f9 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 29ea9c0ce87..8c8854bf28e 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 {