nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-25 16:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11187 from Mic92/diff-closure-fix

Browse Source 
diff-closures: fix a use after free
This commit is contained in:
Robert Hensing 2024-07-27 00:52:38 +02:00 committed by GitHub
commit 88e8c9017a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nix/diff-closures.cc
View File

@ -25,15 +25,17 @@ GroupedPaths getClosureInfo(ref<Store> store, const StorePath & toplevel)
GroupedPaths groupedPaths; GroupedPaths groupedPaths;
for (auto & path : closure) { for (auto const & path : closure) {
/* Strip the output name. Unfortunately this is ambiguous (we /* Strip the output name. Unfortunately this is ambiguous (we
can't distinguish between output names like "bin" and can't distinguish between output names like "bin" and
version suffixes like "unstable"). */ version suffixes like "unstable"). */
static std::regex regex("(.*)-([a-z]+|lib32|lib64)"); static std::regex regex("(.*)-([a-z]+|lib32|lib64)");
std::smatch match; std::cmatch match;
std::string name(path.name()); std::string name{path.name()};
std::string_view const origName = path.name();
std::string outputName; std::string outputName;
if (std::regex_match(name, match, regex)) {
if (std::regex_match(origName.begin(), origName.end(), match, regex)) {
name = match[1]; name = match[1];
outputName = match[2]; outputName = match[2];
} }