weaselab/conflict-set
1
Fork 1
Code Issues 5 Pull Requests Actions 1 Packages Releases 13 Activity

Merge pull request 'Fix move-assignment leak and self-assignment in ConflictSet' (#55) from weaselbot/conflict-set:weaselbot/issue-54 into main
CI / release (arm64, ubuntu-latest-arm64) (push) Successful in 3m25s
Details
CI / pre-commit (push) Successful in 2m4s
Details
CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (push) Successful in 3m38s
Details
CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (push) Successful in 3m31s
Details
CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (push) Successful in 3m39s
Details
CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (push) Successful in 3m29s
Details
CI / release (amd64, ubuntu-latest-amd64) (push) Successful in 4m58s
Details
CI / coverage (push) Successful in 3m48s
Details

Browse Source 
Reviewed-on: #55
This commit was merged in pull request #55.
This commit is contained in:
andrew
2026-06-22 18:40:25 +00:00
parent e9c904a86b 4dc5f7f75c
commit f30887f280
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ConflictSet.cpp
+5
View File
@@ -5589,7 +5589,12 @@ ConflictSet::ConflictSet(ConflictSet &&other) noexcept
: impl(std::exchange(other.impl, nullptr)) {}
ConflictSet &ConflictSet::operator=(ConflictSet &&other) noexcept {
if (this != &other) {
if (impl) {
internal_destroy(impl);
}
impl = std::exchange(other.impl, nullptr);
}
return *this;
}
HashTable.cpp
+6
View File
@@ -119,7 +119,13 @@ ConflictSet::ConflictSet(ConflictSet &&other) noexcept
: impl(std::exchange(other.impl, nullptr)) {}
ConflictSet &ConflictSet::operator=(ConflictSet &&other) noexcept {
if (this != &other) {
if (impl) {
impl->~Impl();
safe_free(impl, sizeof(Impl));
}
impl = std::exchange(other.impl, nullptr);
}
return *this;
}
SkipList.cpp
+5
View File
@@ -981,7 +981,12 @@ ConflictSet::ConflictSet(ConflictSet &&other) noexcept
: impl(std::exchange(other.impl, nullptr)) {}
ConflictSet &ConflictSet::operator=(ConflictSet &&other) noexcept {
if (this != &other) {
if (impl) {
internal_destroy(impl);
}
impl = std::exchange(other.impl, nullptr);
}
return *this;
}