Merge pull request #7336 from filecoin-project/fix/dealcheck-panic

fix a panic in HandleRecoverDealIDs
filecoin-project · Sep 16, 2021 · 45dc969 · 45dc969
2 parents e786a05 + 438d5ce
commit 45dc969
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/extern/storage-sealing/states_failed.go b/extern/storage-sealing/states_failed.go
@@ -394,6 +394,11 @@ func (m *Sealing) HandleRecoverDealIDs(ctx Context, sector SectorInfo) error {
 			failed[i] = xerrors.Errorf("getting current deal info for piece %d: %w", i, err)
 		}
 
+		if res.MarketDeal == nil {
+			failed[i] = xerrors.Errorf("nil market deal (%d,%d,%d,%s)", i, sector.SectorNumber, p.DealInfo.DealID, p.Piece.PieceCID)
+			continue
+		}
+
 		if res.MarketDeal.Proposal.PieceCID != p.Piece.PieceCID {
 			failed[i] = xerrors.Errorf("recovered piece (%d) deal in sector %d (dealid %d) has different PieceCID %s != %s", i, sector.SectorNumber, p.DealInfo.DealID, p.Piece.PieceCID, res.MarketDeal.Proposal.PieceCID)
 			continue