🐛 Restore sanitize toJSON hooks after failures#4750
Merged
Conversation
sanitize() temporarily detaches Object.prototype.toJSON and Array.prototype.toJSON while cloning customer-provided data. If sanitization throws while reading a hostile getter, those prototype methods were not restored. Wrap the sanitizer traversal in a try/finally so prototype toJSON methods are restored on both success and failure paths. Add a regression test that verifies prototype toJSON restoration after a sanitization failure.
5 tasks
Bundles Sizes Evolution
|
🎉 All green!🧪 All tests passed 🎯 Code Coverage (details) 🔗 Commit SHA: 80c9a84 | Docs | Datadog PR Page | Give us feedback! |
BenoitZugmeyer
approved these changes
Jun 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

Motivation
sanitize()temporarily detachesObject.prototype.toJSONandArray.prototype.toJSONwhile cloning customer-provided data.If sanitization throws before the normal return path, for example while reading an enumerable getter, those prototype
toJSONmethods were not restored. This can leave page prototypes modified after a failed sanitization attempt and affect later serialization.Changes
Wrap the sanitizer traversal in a
try/finallyso detached prototypetoJSONmethods are restored on both success and failure paths.Add a regression test covering a throwing getter while
Object.prototype.toJSONis detached.Test instructions
Run:
Checklist