From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 6D947398B8BC; Thu, 17 Sep 2020 17:13:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6D947398B8BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1600362826; bh=k5aLWA0bqWdszIC0XrVfcl1QjlCTNZxJiVGrkLM8rts=; h=From:To:Subject:Date:From; b=MVr2JigLVkjo7HBGTbLoO2RXW4UDHLyJ83MNHNqV/ydn3Yr0iBpxQSGDkJ2hKHG7A 0RInQddhPcAup3mfLV2DPRjy3gCgXq1P2ZrcSJd8pqbmSLiZJvNtNtbzVBmwnvTi1c ROMbVgKGx79rL7xuVH4Ur1MJ7dsDOAlkLNcN+GmE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] libstdc++: Fix unnecessary allocations in read_symlink [PR 96484] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/vendors/redhat/heads/gcc-8-branch X-Git-Oldrev: 9bca9cf810fa2c0b56076ac5b72224c02a7288c8 X-Git-Newrev: b8d67ae6f2ff649725d7edcb18e470f87b711b83 Message-Id: <20200917171346.6D947398B8BC@sourceware.org> Date: Thu, 17 Sep 2020 17:13:46 +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: Thu, 17 Sep 2020 17:13:46 -0000 https://gcc.gnu.org/g:b8d67ae6f2ff649725d7edcb18e470f87b711b83 commit b8d67ae6f2ff649725d7edcb18e470f87b711b83 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/filesystem/ops.cc (fs::read_symlink): Return an error immediately for non-symlinks. * src/filesystem/std-ops.cc (fs::read_symlink): Likewise. (cherry picked from commit 6a13a4e3f29fc4ce5eff96d74ba965c9fdc02184) Diff: --- libstdc++-v3/src/filesystem/ops.cc | 6 ++++++ libstdc++-v3/src/filesystem/std-ops.cc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index f04b4c5fc17..4a14251cfe8 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -987,6 +987,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/std-ops.cc b/libstdc++-v3/src/filesystem/std-ops.cc index 6d0bec48d44..8f3191c1a71 100644 --- a/libstdc++-v3/src/filesystem/std-ops.cc +++ b/libstdc++-v3/src/filesystem/std-ops.cc @@ -1248,6 +1248,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 {