Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unsafeTraverse error handling #5661

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Fix unsafeTraverse error handling #5661

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b0c220
fix traversal error handling
zhangchiqing Apr 12, 2024
4860e67
Update state/fork/traversal.go
zhangchiqing Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions state/fork/traversal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@ func unsafeTraverse(headers storage.Headers, block *flow.Header, visitor onVisit
return block, nil
}

block, err = headers.ByBlockID(block.ParentID)
parent, err := headers.ByBlockID(block.ParentID)
if err != nil {
return nil, fmt.Errorf("failed to revtrieve block header %x: %w", block.ParentID, err)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this case, block could be nil, and causing nil pointer error

return nil, fmt.Errorf("failed to retrieve block header (id=%x height=%d): %w", block.ParentID, block.Height-1, err)
}

block = parent
}
}
Loading