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

Change execution order to avoid reentry through the _beforeTokenTransfer hook #3611

Merged
merged 9 commits into from
Aug 19, 2022
+11 −1
Merged

Change execution order to avoid reentry through the _beforeTokenTransfer hook #3611

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6c3ea96
Change execution order to avoid reentry through the beforeTokenTransf…
Amxx Aug 11, 2022
52058b2
Add changelog entry
Amxx Aug 11, 2022
2c5204a
Update CHANGELOG.md
Amxx Aug 11, 2022
24996ed
Update CHANGELOG.md
Amxx Aug 17, 2022
abae8ca
Update ERC721.sol
Amxx Aug 17, 2022
41f343b
add comment
frangio Aug 17, 2022
90f3c16
Update CHANGELOG.md
frangio Aug 17, 2022
ec24469
Apply strict check-effect
Amxx Aug 19, 2022
b8fc567
minimize diff
Amxx Aug 19, 2022
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
Prev Previous commit
Next Next commit
Update ERC721.sol
@Amxx
Amxx authored Aug 17, 2022

Unverified

No user is associated with the committer email.
Learn about vigilant mode
commit abae8ca620957ce672abf7c381ac09f832671535
2 changes: 1 addition & 1 deletion contracts/token/ERC721/ERC721.sol
View file
Original file line number Diff line number Diff line change
@@ -306,7 +306,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {

_beforeTokenTransfer(from, address(0), tokenId);

require(from == ERC721.ownerOf(tokenId), "ERC721: burn from incorrect owner");
from = ERC721.ownerOf(tokenId);

// Clear approvals
delete _tokenApprovals[tokenId];