delete assignment operators on PrivateKey

Chia-Network · Nov 6, 2020 · ee71adc · ee71adc
1 parent 8ac7fca
commit ee71adc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/src/privatekey.cpp b/src/privatekey.cpp
@@ -67,21 +67,6 @@ PrivateKey::PrivateKey(PrivateKey &&k)
 
 PrivateKey::~PrivateKey() { if(keydata !=NULL) Util::SecFree(keydata); }
 
-PrivateKey& PrivateKey::operator=(PrivateKey const& k) &
-{
-    if (!keydata) AllocateKeyData();
-    bn_copy(*keydata, *k.keydata);
-    return *this;
-}
-
-PrivateKey& PrivateKey::operator=(PrivateKey&& k) &
-{
-    if (keydata) Util::SecFree(keydata);
-    keydata = std::exchange(k.keydata, nullptr);
-    return *this;
-}
->>>>>>> fix resource management in PrivateKey class. add assignment operators to properly copy value (instead of pointer) or move (instead of copying pointer, resulting in double-free)
-
 G1Element PrivateKey::GetG1Element() const
 {
     g1_t *p = Util::SecAlloc<g1_t>(1);

diff --git a/src/privatekey.hpp b/src/privatekey.hpp
@@ -45,8 +45,8 @@ class PrivateKey {
     PrivateKey(const PrivateKey &k);
     PrivateKey(PrivateKey &&k);
 
-    PrivateKey& operator=(PrivateKey const&) &;
-    PrivateKey& operator=(PrivateKey&&) &;
+    PrivateKey& operator=(PrivateKey const&) = delete;
+    PrivateKey& operator=(PrivateKey&&) = delete;
 
     ~PrivateKey();