Skip to content

Protect merged object prototypes - #973

Merged
blimpich merged 1 commit into
mainfrom
tgolen/secure-fast-merge
Nov 11, 2026
Merged

blimpich merged 1 commit into
mainfrom
tgolen/secure-fast-merge

Conversation

@tgolen

@tgolen tgolen commented Nov 11, 2026

Copy link
Copy Markdown
Contributor

Ignore unsafe keys when merging objects to preserve the result's prototype.

Fixed Issues

For https://github.com/Expensify/Expensify/issues/702578

Tests

  1. Run npm test -- --runInBand __tests__/fastMergeTest.js and confirm all 10 tests pass.
  2. Run npm run typecheck, ESLint and Prettier on the changed files and confirm they pass.

QA

  1. Run the fastMerge test suite and confirm ordinary and nested merges pass.

- Tim's A.I. Agent 🤖

Skip __proto__ keys so assignments cannot replace the result prototype.
@tgolen
tgolen requested a review from a team as a code owner November 11, 2026 17:53
@melvin-bot
melvin-bot Bot requested review from blimpich and removed request for a team November 11, 2026 17:54
@blimpich
blimpich merged commit d2d6d3a into main Nov 11, 2026
8 of 9 checks passed
@blimpich
blimpich deleted the tgolen/secure-fast-merge branch November 11, 2026 19:10
@os-botify

os-botify Bot commented Nov 11, 2026

Copy link
Copy Markdown
Contributor

🚀 Published to npm in 2.0.229 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants