refactor: keep vecBytes always properly initialized in bls

Author: knst

src/bls/bls.h

@@ -390,7 +390,7 @@ class CBLSLazyWrapper
 private:
     mutable std::mutex mutex;
 
-    mutable std::array<uint8_t, BLSObject::SerSize> vecBytes;
+    mutable std::array<uint8_t, BLSObject::SerSize> vecBytes{};
 
     mutable BLSObject obj;
     mutable bool objInitialized{false};
@@ -403,7 +403,6 @@ class CBLSLazyWrapper
 
 public:
     CBLSLazyWrapper() :
-        vecBytes{},
         bufLegacyScheme(bls::bls_legacy_scheme.load())
     {}
 
@@ -418,16 +417,10 @@ class CBLSLazyWrapper
         std::unique_lock<std::mutex> l(r.mutex);
         bufValid = r.bufValid;
         bufLegacyScheme = r.bufLegacyScheme;
-        if (r.bufValid) {
-            vecBytes = r.vecBytes;
-        } else {
-            std::fill(vecBytes.begin(), vecBytes.end(), 0);
-        }
+        vecBytes = r.vecBytes;
         objInitialized = r.objInitialized;
         if (r.objInitialized) {
             obj = r.obj;
-        } else {
-            obj.Reset();
         }
         hash = r.hash;
         return *this;
@@ -442,13 +435,18 @@ class CBLSLazyWrapper
     inline void Serialize(Stream& s, const bool specificLegacyScheme) const
     {
         std::unique_lock<std::mutex> l(mutex);
-        if (!objInitialized && !bufValid) {
-            std::fill(vecBytes.begin(), vecBytes.end(), 0);
-        } else if (!bufValid || (bufLegacyScheme != specificLegacyScheme)) {
-            vecBytes = obj.ToBytes(specificLegacyScheme);
-            bufValid = true;
-            bufLegacyScheme = specificLegacyScheme;
-            hash.SetNull();
+        if (!objInitialized) {
+            if (bufValid && bufLegacyScheme != specificLegacyScheme) {
+                obj.SetBytes(vecBytes, bufLegacyScheme);
+                vecBytes = obj.ToBytes(specificLegacyScheme);
+            }
+        } else {
+            if (!bufValid || (bufLegacyScheme != specificLegacyScheme)) {
+                vecBytes = obj.ToBytes(specificLegacyScheme);
+                bufValid = true;
+                bufLegacyScheme = specificLegacyScheme;
+                hash.SetNull();
+            }
         }
         s.write(MakeByteSpan(vecBytes));
     }
@@ -483,6 +481,7 @@ class CBLSLazyWrapper
         bufLegacyScheme = specificLegacyScheme;
         objInitialized = true;
         obj = _obj;
+        std::fill(vecBytes.begin(), vecBytes.end(), 0);
         hash.SetNull();
     }
     const BLSObject& Get() const
@@ -539,7 +538,6 @@ class CBLSLazyWrapper
     {
         std::unique_lock<std::mutex> l(mutex);
         if (!objInitialized && !bufValid) {
-            std::fill(vecBytes.begin(), vecBytes.end(), 0);
             hash.SetNull();
         } else if (!bufValid) {
             vecBytes = obj.ToBytes(bufLegacyScheme);