lix-project/lix
18
39
Fork 15
Code Issues 288 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Merge pull request #6582 from NixOS/debug-fetchgit-sigsev

Browse source 
Fix a segfault in the git fetcher
This commit is contained in:
Eelco Dolstra 2022-05-31 17:17:37 +02:00 committed by GitHub
parent 04a699b8a9 027fd45230
commit 078c80f750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libfetchers/git.cc
View file

@ -449,11 +449,10 @@ struct GitInputScheme : InputScheme
} }
} }
const Attrs unlockedAttrs({ Attrs unlockedAttrs({
{"type", cacheType}, {"type", cacheType},
{"name", name}, {"name", name},
{"url", actualUrl}, {"url", actualUrl},
{"ref", *input.getRef()},
}); });
Path repoDir; Path repoDir;
@ -466,6 +465,7 @@ struct GitInputScheme : InputScheme
head = "master"; head = "master";
} }
input.attrs.insert_or_assign("ref", *head); input.attrs.insert_or_assign("ref", *head);
unlockedAttrs.insert_or_assign("ref", *head);
} }
if (!input.getRev()) if (!input.getRev())
@ -482,6 +482,7 @@ struct GitInputScheme : InputScheme
head = "master"; head = "master";
} }
input.attrs.insert_or_assign("ref", *head); input.attrs.insert_or_assign("ref", *head);
unlockedAttrs.insert_or_assign("ref", *head);
} }
if (auto res = getCache()->lookup(store, unlockedAttrs)) { if (auto res = getCache()->lookup(store, unlockedAttrs)) {