From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1725) id CE9E1386F423; Tue, 18 Aug 2020 18:31:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CE9E1386F423 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1597775469; bh=HMkM4Mc53eTynOJnbE9EuBCabZNdE40kIEaxGoEGnkY=; h=From:To:Subject:Date:From; b=TAVFavWcmHNBq+zwS7Kiv9ED4rvVu57e2pDVoWkit7soQhveb1FhaL5bySMtmOCNM XoKEk3kGTtIbE1h7ke45PmYZNQO1oIJzmfDoLWFJpS1Q0v2VYxghZriPY7x+0/urjS XiOBaiCL84/UTPCvsMk4oroFW79Lip6M3BgjHc/8= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: William Schmidt To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/wschmidt/heads/builtins3)] libstdc++: Fix unnecessary allocations in read_symlink [PR 96484] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/users/wschmidt/heads/builtins3 X-Git-Oldrev: 6251ea15f55ec57d6325c2e37e88b22315aba658 X-Git-Newrev: 6a13a4e3f29fc4ce5eff96d74ba965c9fdc02184 Message-Id: <20200818183109.CE9E1386F423@sourceware.org> Date: Tue, 18 Aug 2020 18:31:09 +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: Tue, 18 Aug 2020 18:31:09 -0000 https://gcc.gnu.org/g:6a13a4e3f29fc4ce5eff96d74ba965c9fdc02184 commit 6a13a4e3f29fc4ce5eff96d74ba965c9fdc02184 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. 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 {