hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Add assertions to unique_ref

Browse Source
This commit is contained in:
Sebastian Messmer 2016-07-14 16:29:02 +02:00
parent 7ea08fc2b0
commit 457ca52eb3
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blockstore/implementations/caching/CachedBlock.cpp
View File

@ -13,7 +13,7 @@ CachedBlock::CachedBlock(unique_ref<Block> baseBlock, CachingBlockStore *blockSt
}
CachedBlock::~CachedBlock() {
if (_baseBlock.get() != nullptr) {
if (_baseBlock.isValid()) {
_blockStore->release(std::move(_baseBlock));
}
}

18
src/cpp-utils/pointer/unique_ref.h
View File

@ -7,6 +7,7 @@
#include "../macros.h"
#include "gcc_4_8_compatibility.h"
#include "cast.h"
#include "../assert/assert.h"
namespace cpputils {
@ -28,24 +29,32 @@ template<typename T>
class unique_ref final {
public:
unique_ref(unique_ref&& from): _target(std::move(from._target)) {}
unique_ref(unique_ref&& from): _target(std::move(from._target)) {
from._target = nullptr;
}
// TODO Test this upcast-allowing move constructor
template<typename U> unique_ref(unique_ref<U>&& from): _target(std::move(from._target)) {}
template<typename U> unique_ref(unique_ref<U>&& from): _target(std::move(from._target)) {
from._target = nullptr;
}
unique_ref& operator=(unique_ref&& from) {
_target = std::move(from._target);
from._target = nullptr;
return *this;
}
// TODO Test this upcast-allowing assignment
template<typename U> unique_ref& operator=(unique_ref<U>&& from) {
_target = std::move(from._target);
from._target = nullptr;
return *this;
}
typename std::add_lvalue_reference<T>::type operator*() const& {
ASSERT(_target.get() != nullptr, "Member was moved out to another unique_ref. This instance is invalid.");
return *_target;
}
typename std::add_rvalue_reference<T>::type operator*() && {
ASSERT(_target.get() != nullptr, "Member was moved out to another unique_ref. This instance is invalid.");
return std::move(*_target);
}
@ -54,6 +63,7 @@ public:
}
T* get() const {
ASSERT(_target.get() != nullptr, "Member was moved out to another unique_ref. This instance is invalid.");
return _target.get();
}
@ -61,6 +71,10 @@ public:
std::swap(_target, rhs._target);
}
bool isValid() const {
return _target.get() != nullptr;
}
private:
unique_ref(std::unique_ptr<T> target): _target(std::move(target)) {}
template<typename U, typename... Args> friend unique_ref<U> make_unique_ref(Args&&... args);

2
src/cryfs/filesystem/cachingfsblobstore/FsBlobRef.cpp
View File

@ -5,7 +5,7 @@ namespace cryfs {
namespace cachingfsblobstore {
FsBlobRef::~FsBlobRef() {
if (_baseBlob.get() != nullptr) {
if (_baseBlob.isValid()) {
_fsBlobStore->releaseForCache(std::move(_baseBlob));
}
}

10
src/fspp/fstest/FsppSymlinkTest.h
View File

@ -15,25 +15,25 @@ public:
TYPED_TEST_CASE_P(FsppSymlinkTest);
TYPED_TEST_P(FsppSymlinkTest, Create_AbsolutePath) {
this->CreateSymlink("mysymlink", "/my/symlink/target");
this->CreateSymlink("/mysymlink", "/my/symlink/target");
}
TYPED_TEST_P(FsppSymlinkTest, Create_RelativePath) {
this->CreateSymlink("mysymlink", "../target");
this->CreateSymlink("/mysymlink", "../target");
}
TYPED_TEST_P(FsppSymlinkTest, Read_AbsolutePath) {
this->CreateSymlink("mysymlink", "/my/symlink/target");
this->CreateSymlink("/mysymlink", "/my/symlink/target");
EXPECT_EQ("/my/symlink/target", this->LoadSymlink("/mysymlink")->target());
}
TYPED_TEST_P(FsppSymlinkTest, Read_RelativePath) {
this->CreateSymlink("mysymlink", "../target");
this->CreateSymlink("/mysymlink", "../target");
EXPECT_EQ("../target", this->LoadSymlink("/mysymlink")->target());
}
TYPED_TEST_P(FsppSymlinkTest, Remove) {
this->CreateSymlink("mysymlink", "/my/symlink/target");
this->CreateSymlink("/mysymlink", "/my/symlink/target");
EXPECT_NE(boost::none, this->device->Load("/mysymlink"));
this->LoadSymlink("/mysymlink")->remove();
EXPECT_EQ(boost::none, this->device->Load("/mysymlink"));