Merge pull request #967 from brain5lug/openssl

missed self assigment check for EDDSAPoint

libi2pd/Signature.h

@@ -363,31 +363,43 @@ namespace crypto
 	// EdDSA
 	struct EDDSAPoint
 	{
-		BIGNUM * x, * y;
+		BIGNUM * x {nullptr};
-		BIGNUM * z, * t; // projective coordinates
+		BIGNUM * y {nullptr};
-		EDDSAPoint (): x(nullptr), y(nullptr), z(nullptr), t(nullptr) {};
+		BIGNUM * z {nullptr};
-		EDDSAPoint (const EDDSAPoint& other): x(nullptr), y(nullptr), z(nullptr), t(nullptr) 
+		BIGNUM * t {nullptr}; // projective coordinates
-		{ *this = other; };	
+
-		EDDSAPoint (EDDSAPoint&& other): x(nullptr), y(nullptr), z(nullptr), t(nullptr)  
+		EDDSAPoint () {}
-		{ *this = std::move (other); };	
+		EDDSAPoint (const EDDSAPoint& other)   { *this = other; }
-		EDDSAPoint (BIGNUM * x1, BIGNUM * y1, BIGNUM * z1 = nullptr, BIGNUM * t1 = nullptr): x(x1), y(y1), z(z1), t(t1) {};	
+		EDDSAPoint (EDDSAPoint&& other)        { *this = std::move (other); }
-		~EDDSAPoint () { BN_free (x); BN_free (y); BN_free(z); BN_free(t); };
+		EDDSAPoint (BIGNUM * x1, BIGNUM * y1, BIGNUM * z1 = nullptr, BIGNUM * t1 = nullptr)
+			: x(x1)
+			, y(y1)
+			, z(z1)
+			, t(t1)
+		{}
+		~EDDSAPoint () { BN_free (x); BN_free (y); BN_free(z); BN_free(t); }
 
 		EDDSAPoint& operator=(EDDSAPoint&& other) 
 		{
-			if (x) BN_free (x); x = other.x; other.x = nullptr;
+			if (this != &other)
-			if (y) BN_free (y); y = other.y; other.y = nullptr;
+			{
-			if (z) BN_free (z); z = other.z; other.z = nullptr;
+				BN_free (x); x = other.x; other.x = nullptr;
-			if (t) BN_free (t); t = other.t; other.t = nullptr;
+				BN_free (y); y = other.y; other.y = nullptr;
+				BN_free (z); z = other.z; other.z = nullptr;
+				BN_free (t); t = other.t; other.t = nullptr;
+			}
 			return *this;
 		} 	
 
 		EDDSAPoint& operator=(const EDDSAPoint& other) 
 		{
-			if (x) BN_free (x); x = other.x ? BN_dup (other.x) : nullptr;
+			if (this != &other)
-			if (y) BN_free (y); y = other.y ? BN_dup (other.y) : nullptr;
+			{
-			if (z) BN_free (z); z = other.z ? BN_dup (other.z) : nullptr;
+				BN_free (x); x = other.x ? BN_dup (other.x) : nullptr;
-			if (t) BN_free (t); t = other.t ? BN_dup (other.t) : nullptr;
+				BN_free (y); y = other.y ? BN_dup (other.y) : nullptr;
+				BN_free (z); z = other.z ? BN_dup (other.z) : nullptr;
+				BN_free (t); t = other.t ? BN_dup (other.t) : nullptr;
+			}
 			return *this;
 		}
 

libi2pd/util.h

@@ -33,6 +33,8 @@ namespace util
 	template<class T>
 	class MemoryPool
 	{
+		BOOST_STATIC_ASSERT_MSG(sizeof(T) >= sizeof(void*), "size cannot be less that general pointer size");
+
 		public:
 
 			MemoryPool (): m_Head (nullptr) {}