fixes

dmkozh · Jun 24, 2024 · aa935a9 · aa935a9
1 parent a6f78b1
commit aa935a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/deny.toml b/deny.toml
@@ -51,7 +51,10 @@ exclude = [
    # Somehow the tracking machinery of two different dev-dep tracing
    # subsystems also winds up pulling in conflicts, but again, just
    # dev-deps or non-produciton configs.
-   "tracking-allocator"
+   "tracking-allocator",
+   # Temporary exclusion due to signing-related vulnerability (this doesn't
+   # affect Core as Core doesn't use this for signing)
+   "curve25519-dalek"
 ]
 
 # If true, metadata will be collected with `--all-features`. Note that this can't

diff --git a/src/herder/TxSetFrame.cpp b/src/herder/TxSetFrame.cpp
@@ -1564,7 +1564,7 @@ TxSetPhaseFrame::sortedForApply(Hash const& txSetHash) const
             else
             {
                 throw std::runtime_error("unexpected TxPhase variant");
-                return TxSetPhaseFrame(TxFrameList{});
+                return TxSetPhaseFrame::makeEmpty(false);
             }
         },
         mTxs);
-Original file line number
+Diff line change
@@ Expand Up @@
                 else
                 {
                     throw std::runtime_error("unexpected TxPhase variant");
-                    return TxSetPhaseFrame(TxFrameList{});
+                    return TxSetPhaseFrame::makeEmpty(false);
                 }
             },
             mTxs);
@@ Expand Down @@