From b57189174f6e11c3e9e0f7c65c08a72f689fe194 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jun 2010 08:34:48 +0000 Subject: [PATCH] * In importPath() and exportPath(), lock the temporary directory to prevent it from being deleted by the garbage collector. --- src/libstore/local-store.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 2c0aa3579..f430492fd 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -873,6 +873,8 @@ void LocalStore::exportPath(const Path & path, bool sign, writeInt(1, hashAndWriteSink); Path tmpDir = createTempDir(); + PathLocks tmpDirLock(singleton(tmpDir)); + tmpDirLock.setDeletion(true); AutoDelete delTmp(tmpDir); Path hashFile = tmpDir + "/hash"; writeFile(hashFile, printHash(hash)); @@ -922,6 +924,8 @@ Path LocalStore::importPath(bool requireSignature, Source & source) store path follows the archive data proper), and besides, we don't know yet whether the signature is valid. */ Path tmpDir = createTempDir(nixStore); + PathLocks tmpDirLock(singleton(tmpDir)); + tmpDirLock.setDeletion(true); AutoDelete delTmp(tmpDir); /* !!! could be GC'ed! */ Path unpacked = tmpDir + "/unpacked";