max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 08:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7503 from edolstra/fix-dirOf

Browse source 
Fix CanonPath::dirOf() returning a string_view of a temporary
This commit is contained in:
Eelco Dolstra 2022-12-23 16:17:48 +01:00 committed by GitHub
commit 14f7dae3e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/canon-path.hh
View file

@ -110,7 +110,7 @@ public:
std::optional<std::string_view> dirOf() const std::optional<std::string_view> dirOf() const
{ {
if (isRoot()) return std::nullopt; if (isRoot()) return std::nullopt;
return path.substr(0, path.rfind('/')); return ((std::string_view) path).substr(0, path.rfind('/'));
} }
std::optional<std::string_view> baseName() const std::optional<std::string_view> baseName() const