Merge pull request #1346 from andrewjstone/msg-deletion-fix

Fix for deletion of messages that are being used. (#1342)
vmware · Apr 2, 2021 · dba6424 · dba6424
2 parents d2cd577 + ff54a58
commit dba6424
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/bftengine/src/bftengine/ReplicaLoader.cpp b/bftengine/src/bftengine/ReplicaLoader.cpp
@@ -175,6 +175,9 @@ ReplicaLoader::ErrorCode loadViewInfo(shared_ptr<PersistentStorage> &p, LoadedRe
                                                   descriptorOfLastNewView.viewChangeMsgs);
 
     ld.maxSeqNumTransferredFromPrevViews = descriptorOfLastNewView.maxSeqNumTransferredFromPrevViews;
+    // we have not used descriptorOfLastExitFromView, therefore
+    // we need to clean up the messages we have allocated inside it.
+    descriptorOfLastExitFromView.clean();
   } else {
     LOG_ERROR(GL,
               "Failed to load view (inconsistent state): " << KVLOG(
@@ -183,7 +186,6 @@ ReplicaLoader::ErrorCode loadViewInfo(shared_ptr<PersistentStorage> &p, LoadedRe
   }
 
   ld.viewsManager = viewsManager;
-  descriptorOfLastExitFromView.clean();
   return Succ;
 }