picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

Prevent uninitialized StorePath creation

Browse source
This commit is contained in:
Eelco Dolstra 2020-02-13 16:12:16 +01:00
parent 94c9343702
commit d8972317fc
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/path.hh
View file

@ -18,6 +18,8 @@ extern "C" {
struct StorePath : rust::Value<3 * sizeof(void *) + 24, ffi_StorePath_drop> struct StorePath : rust::Value<3 * sizeof(void *) + 24, ffi_StorePath_drop>
{ {
StorePath() = delete;
static StorePath make(std::string_view path, std::string_view storeDir); static StorePath make(std::string_view path, std::string_view storeDir);
static StorePath make(unsigned char hash[20], std::string_view name); static StorePath make(unsigned char hash[20], std::string_view name);

2
src/libutil/rust-ffi.hh
View file

@ -113,6 +113,8 @@ extern "C" {
struct String : Vec<char, ffi_String_drop> struct String : Vec<char, ffi_String_drop>
{ {
String() = delete;
String(std::string_view s) String(std::string_view s)
{ {
ffi_String_new(StringSlice(s), this); ffi_String_new(StringSlice(s), this);

4
src/nix/why-depends.cc
View file

@ -103,7 +103,7 @@ struct CmdWhyDepends : SourceExprCommand
std::map<StorePath, Node> graph; std::map<StorePath, Node> graph;
for (auto & path : closure) for (auto & path : closure)
graph.emplace(path.clone(), Node{path.clone(), cloneStorePathSet(store->queryPathInfo(path)->references)}); graph.emplace(path.clone(), Node { .path = path.clone(), .refs = cloneStorePathSet(store->queryPathInfo(path)->references) });
// Transpose the graph. // Transpose the graph.
for (auto & node : graph) for (auto & node : graph)
@ -112,7 +112,7 @@ struct CmdWhyDepends : SourceExprCommand
/* Run Dijkstra's shortest path algorithm to get the distance /* Run Dijkstra's shortest path algorithm to get the distance
of every path in the closure to 'dependency'. */ of every path in the closure to 'dependency'. */
graph[dependencyPath.clone()].dist = 0; graph.emplace(dependencyPath.clone(), Node { .path = dependencyPath.clone(), .dist = 0 });
std::priority_queue<Node *> queue; std::priority_queue<Node *> queue;