fixes an elusive optional dereference

Author: Tapanito

src/xrpld/app/tx/detail/InvariantCheck.cpp

@@ -3467,23 +3467,42 @@ ValidVault::finalize(
                 }
 
                 auto const vaultDeltaAssets = deltaAssets(afterVault.pseudoId);
+                if (vaultDeltaAssets)
+                {
+                    if (*vaultDeltaAssets >= zero)
+                    {
+                        JLOG(j.fatal()) <<  //
+                            "Invariant failed: clawback must decrease vault "
+                            "balance";
+                        result = false;
+                    }
+
+                    if (beforeVault.assetsTotal + *vaultDeltaAssets !=
+                        afterVault.assetsTotal)
+                    {
+                        JLOG(j.fatal()) <<  //
+                            "Invariant failed: clawback and assets outstanding "
+                            "must add up";
+                        result = false;
+                    }
 
-                if (!vaultDeltaAssets && !vaultHoldsNoAssets(beforeVault))
+                    if (beforeVault.assetsAvailable + *vaultDeltaAssets !=
+                        afterVault.assetsAvailable)
+                    {
+                        JLOG(j.fatal()) <<  //
+                            "Invariant failed: clawback and assets available "
+                            "must "
+                            "add up";
+                        result = false;
+                    }
+                }
+                else if (!vaultHoldsNoAssets(beforeVault))
                 {
                     JLOG(j.fatal()) <<  //
                         "Invariant failed: clawback must change vault balance";
                     return false;  // That's all we can do
                 }
 
-                if (*vaultDeltaAssets >= zero &&
-                    !vaultHoldsNoAssets(beforeVault))
-                {
-                    JLOG(j.fatal()) <<  //
-                        "Invariant failed: clawback must decrease vault "
-                        "balance";
-                    result = false;
-                }
-
                 auto const accountDeltaShares = deltaShares(tx[sfHolder]);
                 if (!accountDeltaShares)
                 {
@@ -3516,26 +3535,6 @@ ValidVault::finalize(
                     result = false;
                 }
 
-                if (!vaultHoldsNoAssets(beforeVault) &&
-                    beforeVault.assetsTotal + *vaultDeltaAssets !=
-                        afterVault.assetsTotal)
-                {
-                    JLOG(j.fatal()) <<  //
-                        "Invariant failed: clawback and assets outstanding "
-                        "must add up";
-                    result = false;
-                }
-
-                if (!vaultHoldsNoAssets(beforeVault) &&
-                    beforeVault.assetsAvailable + *vaultDeltaAssets !=
-                        afterVault.assetsAvailable)
-                {
-                    JLOG(j.fatal()) <<  //
-                        "Invariant failed: clawback and assets available must "
-                        "add up";
-                    result = false;
-                }
-
                 return result;
             }
 

src/xrpld/app/tx/detail/VaultClawback.cpp

@@ -89,18 +89,20 @@ VaultClawback::preclaim(PreclaimContext const& ctx)
     if (sharesTotal > 0 && assetsTotal == 0 && assetsAvailable == 0 &&
         account == owner)
     {
-        Number const sharesHeld = accountHolds(
-            ctx.view,
-            holder,
-            share,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
-            ctx.j);
-
-        // The VaultOwner must burn all shares
-        if (std::optional<Number> const amount = ctx.tx[~sfAmount];
-            amount && *amount != sharesHeld)
-            return tecLIMIT_EXCEEDED;
+        if (auto const amount = ctx.tx[~sfAmount]; amount)
+        {
+            Number const sharesHeld = accountHolds(
+                ctx.view,
+                holder,
+                share,
+                FreezeHandling::fhIGNORE_FREEZE,
+                AuthHandling::ahIGNORE_AUTH,
+                ctx.j);
+
+            // The VaultOwner must burn all shares
+            if (*amount != sharesHeld)
+                return tecLIMIT_EXCEEDED;
+        }
 
         return tesSUCCESS;
     }