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

Check lastPreimage != nil before accessing the cached preimage #114

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Check lastPreimage != nil before accessing the cached preimage #114

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
962c666
Check lastPreimage != nil before accessing the cached preimage
mininny Jan 7, 2025
1203fc4
Add instrumented_test.go
mininny Jan 9, 2025
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
2 changes: 1 addition & 1 deletion rvgo/fast/instrumented.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func (m *InstrumentedState) Step(proof bool) (wit *StepWitness, err error) {

func (m *InstrumentedState) readPreimage(key [32]byte, offset uint64) (dat [32]byte, datLen uint64, err error) {
preimage := m.lastPreimage
if key != m.lastPreimageKey {
if preimage == nil || key != m.lastPreimageKey {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure this is right - cannon doesn't perform this check - see here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yep, this is normally not needed, but the reviewers pointed out that this can result in NPE if a preimage read is not preceded with preimage write - just in case the client program misbehaves.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Also added a test here: 1203fc4 so that we can check the regression

m.lastPreimageKey = key
data := m.preimageOracle.GetPreimage(key)
// add the length prefix
Expand Down
Loading