From 81e856fda280ce098b225311716739e5a0999b6c Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Mon, 5 Oct 2015 19:09:17 +0200 Subject: [PATCH] Fix DirBlob::releaseBaseBlob() --- src/filesystem/fsblobstore/DirBlob.cpp | 1 + src/filesystem/fsblobstore/FsBlob.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/filesystem/fsblobstore/DirBlob.cpp b/src/filesystem/fsblobstore/DirBlob.cpp index 422a1e58..bb3e71f4 100644 --- a/src/filesystem/fsblobstore/DirBlob.cpp +++ b/src/filesystem/fsblobstore/DirBlob.cpp @@ -262,6 +262,7 @@ void DirBlob::setLstatSizeGetter(std::function ge cpputils::unique_ref DirBlob::releaseBaseBlob() { std::unique_lock lock(_mutex); _writeEntriesToBlob(); + return FsBlob::releaseBaseBlob(); } } diff --git a/src/filesystem/fsblobstore/FsBlob.h b/src/filesystem/fsblobstore/FsBlob.h index fcd84842..985ba7c2 100644 --- a/src/filesystem/fsblobstore/FsBlob.h +++ b/src/filesystem/fsblobstore/FsBlob.h @@ -24,10 +24,11 @@ namespace cryfs { static void InitializeBlobWithMagicNumber(blobstore::Blob *blob, unsigned char magicNumber); - private: friend class FsBlobStore; virtual cpputils::unique_ref releaseBaseBlob(); + private: + cpputils::unique_ref _baseBlob; DISALLOW_COPY_AND_ASSIGN(FsBlob);