picnoir/nix-gh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix segfault in nix-copy-closure

Browse source
This commit is contained in:
Eelco Dolstra 2016-05-04 12:05:46 +02:00
parent 33de2bc080
commit 4e17e7a4da
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
perl/lib/Nix/Store.xs
View file

@ -25,6 +25,7 @@ static ref<Store> store()
static std::shared_ptr<Store> _store; static std::shared_ptr<Store> _store;
if (!_store) { if (!_store) {
try { try {
logger = makeDefaultLogger();
settings.processEnvironment(); settings.processEnvironment();
settings.loadConfFile(); settings.loadConfFile();
settings.update(); settings.update();
@ -173,7 +174,7 @@ void exportPaths(int fd, ...)
PPCODE: PPCODE:
try { try {
Paths paths; Paths paths;
for (int n = 2; n < items; ++n) paths.push_back(SvPV_nolen(ST(n))); for (int n = 1; n < items; ++n) paths.push_back(SvPV_nolen(ST(n)));
FdSink sink(fd); FdSink sink(fd);
store()->exportPaths(paths, sink); store()->exportPaths(paths, sink);
} catch (Error & e) { } catch (Error & e) {